From: Ruben Kerkhof <ruben@rubenkerkhof.com>
Date: Sat, 4 Oct 2014 18:29:53 +0000 (+0200)
Subject: Fixup the static binaries check
X-Git-Tag: rec-3.7.0-rc1~219^2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F1766%2Fhead;p=thirdparty%2Fpdns.git

Fixup the static binaries check

It did set a variable which wasn't used (debug)
and didn't display a result.

Now we display the default, and yes/no properly

This still doesn't change the fact that --enable-static-binaries
doesn't do the right thing, but I'll fix that in another patch.
---

diff --git a/configure.ac b/configure.ac
index e2814b5b48..006f062f94 100644
--- a/configure.ac
+++ b/configure.ac
@@ -194,24 +194,18 @@ PDNS_ENABLE_PKCS11
 PDNS_WITH_CRYPTOPP
 PDNS_ENABLE_REMOTEBACKEND_ZEROMQ
 
-AC_MSG_CHECKING([whether we should build static binaries])
+AC_MSG_CHECKING([whether we will be building 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]
+  [AS_HELP_STRING([--enable-static-binaries],[build static binaries @<:@default=no@:>@])],
+  [static=$enableval],
+  [static=no],
 )
 AC_MSG_RESULT([$static])
-
-AM_CONDITIONAL([ALLSTATIC], [test "x$static" = "xtrue"])
-
-if test "x$static" = "xtrue"; then
-  LDFLAGS="-all-static $LDFLAGS"
-fi
+AM_CONDITIONAL([ALLSTATIC], [test "x$static" != "xno"])
+AS_IF([test "x$static" != "xno"],
+  [LDFLAGS="-all-static $LDFLAGS"]
+])
 
 modules="bind gmysql geo random"
 AC_ARG_WITH([modules],