]> granicus.if.org Git - pdns/commitdiff
Use pkg-config --static to pick up deps
authorRuben Kerkhof <ruben@rubenkerkhof.com>
Tue, 23 Dec 2014 11:52:26 +0000 (12:52 +0100)
committerRuben Kerkhof <ruben@rubenkerkhof.com>
Mon, 12 Jan 2015 16:18:45 +0000 (17:18 +0100)
Fixes #1912

configure.ac
pdns/Makefile.am

index 6f6830b64d02c8539b306ffa78030a4aad3c8a0f..467f67df9b21e8c7cfa2675303596d992e949795 100644 (file)
@@ -174,9 +174,11 @@ AC_ARG_ENABLE([static-binaries],
   [static=no],
 )
 AC_MSG_RESULT([$static])
-AS_IF([test "x$static" != "xno"],
-  [LDFLAGS="-all-static $LDFLAGS"]
-)
+AS_IF([test "x$static" != "xno"], [
+  LDFLAGS="-all-static $LDFLAGS"
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
+  PKG_CONFIG="$PKG_CONFIG --static"
+])
 
 modules="bind gmysql geo random"
 AC_ARG_WITH([modules],
index db9db8d69bc1a62e4bd047c89f4a12c470fa9866..aa06ff9bcca85710c81a000f164c003521fcc878 100644 (file)
@@ -189,12 +189,12 @@ pdns_server_LDADD = \
 
 if BOTAN110
 pdns_server_SOURCES += botan110signers.cc botansigners.cc
-pdns_server_LDADD += $(BOTAN110_LIBS) -lgmp -lrt
+pdns_server_LDADD += $(BOTAN110_LIBS)
 endif
 
 if BOTAN18
 pdns_server_SOURCES += botan18signers.cc botansigners.cc
-pdns_server_LDADD += $(BOTAN18_LIBS) -lgmp
+pdns_server_LDADD += $(BOTAN18_LIBS)
 endif
 
 if CRYPTOPP
@@ -283,12 +283,12 @@ pdnssec_LDADD = \
 
 if BOTAN110
 pdnssec_SOURCES += botan110signers.cc botansigners.cc
-pdnssec_LDADD += $(BOTAN110_LIBS) -lgmp -lrt
+pdnssec_LDADD += $(BOTAN110_LIBS)
 endif
 
 if BOTAN18
 pdnssec_SOURCES += botan18signers.cc botansigners.cc
-pdnssec_LDADD += $(BOTAN18_LIBS) -lgmp
+pdnssec_LDADD += $(BOTAN18_LIBS)
 endif
 
 if CRYPTOPP