From: Thomas Markwalder <tmark@isc.org>
Date: Thu, 27 Jul 2017 13:46:21 +0000 (-0400)
Subject: [5337] Changed glib static lib test to trigger on enable-static-link
X-Git-Tag: trac5124a_base~28^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=deb49fc948218904c25813bf3a38591f4ee388cd;p=thirdparty%2Fkea.git

[5337] Changed glib static lib test to trigger on enable-static-link

    configure.ac - changed the glib static test to trigger on
    enable-static-link, rather than enable-static.  The latter is on by
    default, and testing based on this would fall over on lots of systems
    requiring folks to specify --disable-static or install the glib static
    libs.
---

diff --git a/configure.ac b/configure.ac
index 6b4c21cf89..a72c341a7f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -441,7 +441,7 @@ if test $enable_shared != "no" -a "X$GXX" = "Xyes"; then
 fi
 
 # Look for glib static libs if they're trying to do static builds
-if test $enable_static != "no"; then
+if test $enable_static_link != "no"; then
    CXX_SAVED=$CXX
    CXX="$CXX -static"
 
@@ -449,7 +449,7 @@ if test $enable_static != "no"; then
      [AC_LANG_PROGRAM([#include <math.h>],[(void)sqrt(-1.0);])],
      [AC_MSG_RESULT([checking for static glib libraries... yes])],
      [AC_MSG_RESULT([checking for static glib libraries... no])
-      AC_MSG_ERROR([Building with --enable-static does not work. You appear to be missing glib static libraries. Check config.log for details.])])
+      AC_MSG_ERROR([Building with --enable-static-link does not work. You appear to be missing glib static libraries. Check config.log for details.])])
 
    CXX=$CXX_SAVED
 fi