From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 13 Jan 2015 12:09:49 +0000 (+0100)
Subject: Override PKG_CONFIG sooner
X-Git-Tag: rec-3.7.0-rc1~28^2~3^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=a49b335616721afc4b3ff250c2dad8bb8a0bac10;p=thirdparty%2Fpdns.git

Override PKG_CONFIG sooner

We need to override PKG_CONFIG before any calls to PKG_PROG_PKG_CONFIG
---

diff --git a/configure.ac b/configure.ac
index cec49c3ed9..7f05c0af4d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -60,6 +60,20 @@ AM_CONDITIONAL([RELEASE_BUILD], [test "$PACKAGE_VERSION" != "git"])
 # We use this to search for other libraries.
 eval full_libdir="\"$libdir\""
 
+# check if we want a static build
+AC_MSG_CHECKING([whether we will be building static binaries])
+
+AC_ARG_ENABLE([static-binaries],
+  [AS_HELP_STRING([--enable-static-binaries],[build static binaries @<:@default=no@:>@])],
+  [static=$enableval],
+  [static=no],
+)
+AC_MSG_RESULT([$static])
+
+AS_IF([test "x$static" != "xno"], [
+  PKG_CONFIG="$PKG_CONFIG --static"
+])
+
 # detect pkg-config explicitly
 PKG_PROG_PKG_CONFIG
 
@@ -162,17 +176,9 @@ PDNS_WITH_CRYPTOPP
 PDNS_ENABLE_ED25519
 PDNS_ENABLE_REMOTEBACKEND_ZEROMQ
 
-AC_MSG_CHECKING([whether we will be building static binaries])
-
-AC_ARG_ENABLE([static-binaries],
-  [AS_HELP_STRING([--enable-static-binaries],[build static binaries @<:@default=no@:>@])],
-  [static=$enableval],
-  [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"
+])
 
 modules="bind gmysql geo random"
 AC_ARG_WITH([modules],