From 705a73f34f1c963c1b96d3fcb0b2f74260e31204 Mon Sep 17 00:00:00 2001
From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Tue, 13 Jan 2015 13:09:49 +0100
Subject: [PATCH] Override PKG_CONFIG sooner

We need to override PKG_CONFIG before any calls to PKG_PROG_PKG_CONFIG

(cherry picked from commit a49b335616721afc4b3ff250c2dad8bb8a0bac10)

Conflicts:
	configure.ac
---
 configure.ac | 32 ++++++++++++++++----------------
 1 file changed, 16 insertions(+), 16 deletions(-)

diff --git a/configure.ac b/configure.ac
index 83f69930f..efdc69eab 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
 
@@ -194,24 +208,10 @@ PDNS_ENABLE_PKCS11
 PDNS_WITH_CRYPTOPP
 PDNS_ENABLE_REMOTEBACKEND_ZEROMQ
 
-AC_MSG_CHECKING([whether we should build static binaries])
 
-AC_ARG_ENABLE([static-binaries],
-  [AS_HELP_STRING([--enable-static-binaries],[build static binaries])],
-  [case "${enableval}" in
-    yes) static=true ;;
-    no)  static=false ;;
-    *) AC_MSG_ERROR(bad value ${enableval} for --enable-static-binaries) ;;
-   esac],
-   [debug=false]
-)
-AC_MSG_RESULT([$static])
-
-AM_CONDITIONAL([ALLSTATIC], [test "x$static" = "xtrue"])
-
-if test "x$static" = "xtrue"; then
+AS_IF([test "x$static" != "xno"], [
   LDFLAGS="-all-static $LDFLAGS"
-fi
+])
 
 modules="bind gmysql geo random"
 AC_ARG_WITH([modules],
-- 
2.40.0