From 1504e033e0aea5636f8fddc620476a93b0b7e043 Mon Sep 17 00:00:00 2001
From: Mark Wooding <mdw@distorted.org.uk>
Date: Wed, 16 Jul 2014 10:11:37 +0100
Subject: [PATCH] Makefile.am, configure.ac, progs/Makefile.am: Link math
 library explicitly.

Rename `CATACOMB_LIBS' to `MATHLIBS' and use it explicitly in some of
the utility builds.

If the main library needs more library dependencies then it'll probably
be best to sort them out in the Makefile.
---
 Makefile.am       | 2 +-
 configure.ac      | 4 ++--
 progs/Makefile.am | 2 ++
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index fb8d6441..d18ac3a2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,7 +34,7 @@ SUBDIRS			 =
 
 lib_LTLIBRARIES		 = libcatacomb.la
 libcatacomb_la_LDFLAGS	 = -version-info $(LIBTOOL_VERSION_INFO)
-libcatacomb_la_LIBADD	 = $(CATACOMB_LIBS) $(mLib_LIBS)
+libcatacomb_la_LIBADD	 = $(MATHLIBS) $(mLib_LIBS)
 libcatacomb_la_SOURCES	 =
 
 ## Basic utilities.
diff --git a/configure.ac b/configure.ac
index dc7434ab..2b77ab46 100644
--- a/configure.ac
+++ b/configure.ac
@@ -56,10 +56,10 @@ AC_CHECK_TYPE([ssize_t], [int])
 AC_CHECK_TYPE([socklen_t], [int])
 
 dnl The maths library.
-mdw_ORIG_LIBS=$LIBS
+mdw_ORIG_LIBS=$LIBS LIBS=
 AC_SEARCH_LIBS([log], [m])
 AC_SEARCH_LIBS([sqrt], [m])
-AC_SUBST([CATACOMB_LIBS], [$LIBS])
+AC_SUBST([MATHLIBS], [$LIBS])
 LIBS=$mdw_ORIG_LIBS
 
 dnl Find out whether very long integer types are available.
diff --git a/progs/Makefile.am b/progs/Makefile.am
index 4d1dbd9c..883174da 100644
--- a/progs/Makefile.am
+++ b/progs/Makefile.am
@@ -92,9 +92,11 @@ 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
-- 
2.11.0