From 02fe0bac4900ef5498113b533eef67d0269a37b4 Mon Sep 17 00:00:00 2001 From: Mark Wooding Date: Thu, 26 May 2016 09:26:09 +0100 Subject: [PATCH] configure.ac, Makefile.am: Collect libs only needed by Catcomb itself. Currently there aren't any, but some may turn up soon. Oddly, the `pkg-config' machinery already had all the right stuff in it: it just wasn't being exercised. --- Makefile.am | 3 ++- configure.ac | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Makefile.am b/Makefile.am index 22c73795..f6fa9349 100644 --- a/Makefile.am +++ b/Makefile.am @@ -35,7 +35,8 @@ SUBDIRS = lib_LTLIBRARIES = libcatacomb.la libcatacomb_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO) \ -no-undefined -libcatacomb_la_LIBADD = $(MATHLIBS) $(PIXIE_LIBS) $(mLib_LIBS) +libcatacomb_la_LIBADD = $(MATHLIBS) $(PIXIE_LIBS) $(CATACOMB_LIBS) \ + $(mLib_LIBS) libcatacomb_la_SOURCES = ## Basic utilities. diff --git a/configure.ac b/configure.ac index 7887da32..c9107c5b 100644 --- a/configure.ac +++ b/configure.ac @@ -139,6 +139,8 @@ AC_CHECK_FUNCS([getauxval]) dnl-------------------------------------------------------------------------- dnl C programming environment. +CATACOMB_LIBS= + dnl Find out if we're cross-compiling. AM_CONDITIONAL([CROSS_COMPILING], [test "$cross_compiling" = yes]) @@ -250,6 +252,9 @@ LIBS=$mdw_ORIG_LIBS dnl Memory locking support. AC_CHECK_FUNCS([mlock]) +dnl Set the master libraries we need. +AC_SUBST([CATACOMB_LIBS]) + dnl Necessary support libraries. PKG_CHECK_MODULES([mLib], [mLib >= 2.2.2.1]) AM_CFLAGS="$AM_CFLAGS $mLib_CFLAGS" -- 2.11.0