From: Peter van Dijk <peter.van.dijk@netherlabs.nl>
Date: Tue, 13 Jan 2015 12:21:36 +0000 (+0000)
Subject: Revert "Use pkg-config --static to pick up deps"
X-Git-Tag: rec-3.7.0-rc1~28^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6f98a4288d1b34c0983fd32c2c37513910594136;p=thirdparty%2Fpdns.git

Revert "Use pkg-config --static to pick up deps"

This reverts commit e25a0864f82865afddab2871490106baa71f1786.

Reopens #1912
---

diff --git a/configure.ac b/configure.ac
index d2e639cafb..cec49c3ed9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -170,11 +170,9 @@ AC_ARG_ENABLE([static-binaries],
   [static=no],
 )
 AC_MSG_RESULT([$static])
-AS_IF([test "x$static" != "xno"], [
-  LDFLAGS="-all-static $LDFLAGS"
-  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
-  PKG_CONFIG="$PKG_CONFIG --static"
-])
+AS_IF([test "x$static" != "xno"],
+  [LDFLAGS="-all-static $LDFLAGS"]
+)
 
 modules="bind gmysql geo random"
 AC_ARG_WITH([modules],
diff --git a/pdns/Makefile.am b/pdns/Makefile.am
index aa06ff9bcc..db9db8d69b 100644
--- a/pdns/Makefile.am
+++ b/pdns/Makefile.am
@@ -189,12 +189,12 @@ pdns_server_LDADD = \
 
 if BOTAN110
 pdns_server_SOURCES += botan110signers.cc botansigners.cc
-pdns_server_LDADD += $(BOTAN110_LIBS)
+pdns_server_LDADD += $(BOTAN110_LIBS) -lgmp -lrt
 endif
 
 if BOTAN18
 pdns_server_SOURCES += botan18signers.cc botansigners.cc
-pdns_server_LDADD += $(BOTAN18_LIBS)
+pdns_server_LDADD += $(BOTAN18_LIBS) -lgmp
 endif
 
 if CRYPTOPP
@@ -283,12 +283,12 @@ pdnssec_LDADD = \
 
 if BOTAN110
 pdnssec_SOURCES += botan110signers.cc botansigners.cc
-pdnssec_LDADD += $(BOTAN110_LIBS)
+pdnssec_LDADD += $(BOTAN110_LIBS) -lgmp -lrt
 endif
 
 if BOTAN18
 pdnssec_SOURCES += botan18signers.cc botansigners.cc
-pdnssec_LDADD += $(BOTAN18_LIBS)
+pdnssec_LDADD += $(BOTAN18_LIBS) -lgmp
 endif
 
 if CRYPTOPP