From: Mark Wooding <mdw@distorted.org.uk>
Date: Thu, 14 Jun 2018 10:02:09 +0000 (+0100)
Subject: build: Configure `pkg-config' correctly for static linking.
X-Git-Tag: 2.4.3~23
X-Git-Url: https://git.distorted.org.uk/~mdw/catacomb/commitdiff_plain/f72de1ee756e59988c9c9bb49df42f513aa9dca1

build: Configure `pkg-config' correctly for static linking.
---

diff --git a/configure.ac b/configure.ac
index 142b854a..af083714 100644
--- a/configure.ac
+++ b/configure.ac
@@ -240,11 +240,10 @@ AC_CHECK_TYPE([socklen_t], [],
 ])
 
 dnl The maths library.
-mdw_ORIG_LIBS=$LIBS LIBS=
+mdw_ORIG_LIBS=$LIBS LIBS=$CATACOMB_LIBS
 AC_SEARCH_LIBS([log], [m])
 AC_SEARCH_LIBS([sqrt], [m])
-AC_SUBST([MATHLIBS], [$LIBS])
-LIBS=$mdw_ORIG_LIBS
+CATACOMB_LIBS=$LIBS LIBS=$mdw_ORIG_LIBS
 
 dnl Logging is weird under Termux.  Unfortunately, it involves macros, so we
 dnl have to do this the hard way.
diff --git a/progs/Makefile.am b/progs/Makefile.am
index ff7f5f76..5f4e570c 100644
--- a/progs/Makefile.am
+++ b/progs/Makefile.am
@@ -33,7 +33,7 @@ UTILS_LIBS		 = \
 	libcatcrypt.la $(top_builddir)/libcatacomb.la \
 	$(mLib_LIBS) $(LIBS)
 
-LDADD			 = $(UTILS_LIBS)
+LDADD			 = $(UTILS_LIBS) $(CATACOMB_LIBS)
 
 ###--------------------------------------------------------------------------
 ### The `catcrypt' library.
@@ -92,11 +92,9 @@ dist_man_MANS		+= key.1 keyring.5
 ## Generate passphrases with given entropy using wordlists and Markov models.
 bin_PROGRAMS		+= mkphrase
 dist_man_MANS		+= mkphrase.1
-mkphrase_LDADD		 = $(LDADD) $(MATHLIBS)
 
 ## Performance testing.
 bin_PROGRAMS		+= perftest
-perftest_LDADD		 = $(LDADD) $(MATHLIBS)
 
 ## Remember passphrases for limited periods of time.
 bin_PROGRAMS		+= pixie