From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sun, 15 Mar 2015 17:24:53 +0000 (-0700)
Subject: Bug 4204: ./configure does not abort when required helpers cannot be built
X-Git-Tag: merge-candidate-3-v1~215
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=c1bbd56cf8e24837f3186463ccc614453ba37617;p=thirdparty%2Fsquid.git

Bug 4204: ./configure does not abort when required helpers cannot be built
---

diff --git a/helpers/basic_auth/modules.m4 b/helpers/basic_auth/modules.m4
index 192776c73f..8ab868b25c 100644
--- a/helpers/basic_auth/modules.m4
+++ b/helpers/basic_auth/modules.m4
@@ -19,8 +19,10 @@ if test "x$enable_auth_basic" != "xno" -a "x$enable_auth" = "xno" ; then
     AC_MSG_ERROR([Basic auth requested but auth disabled])
 fi
 #define list of modules to build
+auto_auth_basic_modules=no
 if test "x$enable_auth_basic" = "xyes" ; then
     SQUID_LOOK_FOR_MODULES([$srcdir/helpers/basic_auth],[enable_auth_basic])
+  auto_auth_basic_modules=yes
 fi
 #handle the "none" special case
 if test "x$enable_auth_basic" = "xnone" ; then
@@ -84,7 +86,11 @@ if test "x$enable_auth_basic" != "xno" ; then
 
       if test -d "$srcdir/helpers/basic_auth/$helper"; then
         if test "$BUILD_HELPER" != "$helper"; then
-          AC_MSG_NOTICE([Basic auth helper $helper ... found but cannot be built])
+          if test "x$auto_auth_basic_modules" = "xyes"; then
+            AC_MSG_NOTICE([Basic auth helper $helper ... found but cannot be built])
+          else
+            AC_MSG_ERROR([Basic auth helper $helper ... found but cannot be built])
+          fi
         else
           BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS $BUILD_HELPER"
         fi
diff --git a/helpers/digest_auth/modules.m4 b/helpers/digest_auth/modules.m4
index 1ad4988036..443c2672e7 100644
--- a/helpers/digest_auth/modules.m4
+++ b/helpers/digest_auth/modules.m4
@@ -19,8 +19,10 @@ if test "x$enable_auth_digest" != "xno" -a "x$enable_auth" = "xno" ; then
     AC_MSG_ERROR([Digest auth requested but auth disabled])
 fi
 #define list of modules to build
+auto_auth_digest_modules=no
 if test "x$enable_auth_digest" = "xyes" ; then
     SQUID_LOOK_FOR_MODULES([$srcdir/helpers/digest_auth],[enable_auth_digest])
+  auto_auth_digest_modules=yes
 fi
 #handle the "none" special case
 if test "x$enable_auth_digest" = "xnone" ; then
@@ -53,7 +55,11 @@ if test "x$enable_auth_digest" != "xno" ; then
 
       if test -d "$srcdir/helpers/digest_auth/$helper"; then
         if test "$BUILD_HELPER" != "$helper"; then
-          AC_MSG_NOTICE([Digest auth helper $helper ... found but cannot be built])
+          if test "x$auto_auth_digest_modules" = "xyes"; then
+            AC_MSG_NOTICE([Digest auth helper $helper ... found but cannot be built])
+          else
+            AC_MSG_ERROR([Digest auth helper $helper ... found but cannot be built])
+          fi
         else
           DIGEST_AUTH_HELPERS="$DIGEST_AUTH_HELPERS $BUILD_HELPER"
         fi
diff --git a/helpers/external_acl/modules.m4 b/helpers/external_acl/modules.m4
index b8d15891c3..8c658e734c 100644
--- a/helpers/external_acl/modules.m4
+++ b/helpers/external_acl/modules.m4
@@ -11,8 +11,10 @@
 # FIXME: de-duplicate $enable_external_acl_helpers list containing double entries.
 
 #define list of modules to build
+auto_ext_acl_modules=no
 if test "x${enable_external_acl_helpers:=yes}" = "xyes" ;then
   SQUID_LOOK_FOR_MODULES([$srcdir/helpers/external_acl],[enable_external_acl_helpers])
+  auto_ext_acl_modules=yes
 fi
 if test "x$enable_external_acl_helpers" = "xnone" ; then
   enable_external_acl_helpers=""
@@ -68,7 +70,11 @@ if test "x$enable_external_acl_helpers" != "xno" ; then
 
       if test -d "$srcdir/helpers/external_acl/$helper"; then
         if test "$BUILD_HELPER" != "$helper"; then
-          AC_MSG_NOTICE([external acl helper $helper ... found but cannot be built])
+          if test "x$auto_ext_acl_modules" = "xyes"; then
+            AC_MSG_NOTICE([external acl helper $helper ... found but cannot be built])
+          else
+            AC_MSG_ERROR([external acl helper $helper ... found but cannot be built])
+          fi
         else
           EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS $BUILD_HELPER"
         fi
diff --git a/helpers/log_daemon/modules.m4 b/helpers/log_daemon/modules.m4
index 9a2c4c8cf2..83214e6a40 100644
--- a/helpers/log_daemon/modules.m4
+++ b/helpers/log_daemon/modules.m4
@@ -11,9 +11,11 @@
 # FIXME: de-duplicate $enable_log_daemon_helpers list containing double entries.
 
 #define list of modules to build
+auto_logdaemon_modules=no
 if test "x${enable_log_daemon_helpers:=yes}" = "xyes" ;then
   enable_log_daemon_helpers=""
   SQUID_LOOK_FOR_MODULES([$srcdir/helpers/log_daemon],[enable_log_daemon_helpers])
+  auto_logdaemon_modules=yes
 fi
 if test "x$enable_log_daemon_helpers" = "xnone" ; then
   enable_log_daemon_helpers=""
@@ -40,7 +42,11 @@ if test "x$enable_log_daemon_helpers" != "xno"; then
 
     if test -d "$srcdir/helpers/log_daemon/$helper"; then
       if test "$BUILD_HELPER" != "$helper"; then
-        AC_MSG_NOTICE([Log daemon helper $helper ... found but cannot be built])
+        if test "x$auto_logdaemon_modules" = "xyes"; then
+          AC_MSG_NOTICE([Log daemon helper $helper ... found but cannot be built])
+        else
+          AC_MSG_ERROR([Log daemon helper $helper ... found but cannot be built])
+        fi
       else
        LOG_DAEMON_HELPERS="$LOG_DAEMON_HELPERS $BUILD_HELPER"
       fi
diff --git a/helpers/negotiate_auth/modules.m4 b/helpers/negotiate_auth/modules.m4
index 5871f9388f..3fcc678ce8 100644
--- a/helpers/negotiate_auth/modules.m4
+++ b/helpers/negotiate_auth/modules.m4
@@ -19,8 +19,10 @@ if test "x$enable_auth_negotiate" != "xno" -a "x$enable_auth" = "xno" ; then
     AC_MSG_ERROR([Negotiate auth requested but auth disabled])
 fi
 #define list of modules to build
+auto_auth_negotiate_modules=no
 if test "x$enable_auth_negotiate" = "xyes" ; then
     SQUID_LOOK_FOR_MODULES([$srcdir/helpers/negotiate_auth],[enable_auth_negotiate])
+  auto_auth_negotiate_modules=yes
 fi
 #handle the "none" special case
 if test "x$enable_auth_negotiate" = "xnone" ; then
@@ -53,7 +55,11 @@ if test "x$enable_auth_negotiate" != "xno" ; then
 
       if test -d "$srcdir/helpers/negotiate_auth/$helper"; then
         if test "$BUILD_HELPER" != "$helper"; then
-          AC_MSG_NOTICE([Negotiate auth helper $helper ... found but cannot be built])
+          if test "x$auto_auth_negotiate_modules" = "xyes"; then
+            AC_MSG_NOTICE([Negotiate auth helper $helper ... found but cannot be built])
+          else
+            AC_MSG_ERROR([Negotiate auth helper $helper ... found but cannot be built])
+          fi
         else
           NEGOTIATE_AUTH_HELPERS="$NEGOTIATE_AUTH_HELPERS $BUILD_HELPER"
         fi
diff --git a/helpers/ntlm_auth/modules.m4 b/helpers/ntlm_auth/modules.m4
index d73ec2b172..54cfb30f00 100644
--- a/helpers/ntlm_auth/modules.m4
+++ b/helpers/ntlm_auth/modules.m4
@@ -19,8 +19,10 @@ if test "x$enable_auth_ntlm" != "xno" -a "x$enable_auth" = "xno" ; then
     AC_MSG_ERROR([NTLM auth requested but auth disabled])
 fi
 #define list of modules to build
+auto_auth_ntlm_modules=no
 if test "x$enable_auth_ntlm" = "xyes" ; then
     SQUID_LOOK_FOR_MODULES([$srcdir/helpers/ntlm_auth],[enable_auth_ntlm])
+  auto_auth_ntlm_modules=yes
 fi
 #handle the "none" special case
 if test "x$enable_auth_ntlm" = "xnone" ; then
@@ -54,7 +56,11 @@ if test "x$enable_auth_ntlm" != "xno" ; then
 
       if test -d "$srcdir/helpers/ntlm_auth/$helper"; then
         if test "$BUILD_HELPER" != "$helper"; then
-          AC_MSG_NOTICE([NTLM auth helper $helper ... found but cannot be built])
+          if test "x$auto_auth_ntlm_modules" = "xyes"; then
+            AC_MSG_NOTICE([NTLM auth helper $helper ... found but cannot be built])
+          else
+            AC_MSG_ERROR([NTLM auth helper $helper ... found but cannot be built])
+          fi
         else
           NTLM_AUTH_HELPERS="$NTLM_AUTH_HELPERS $BUILD_HELPER"
         fi
diff --git a/helpers/storeid_rewrite/modules.m4 b/helpers/storeid_rewrite/modules.m4
index 7aef8c2b33..7ad38a55e7 100644
--- a/helpers/storeid_rewrite/modules.m4
+++ b/helpers/storeid_rewrite/modules.m4
@@ -11,8 +11,10 @@
 # FIXME: de-duplicate $enable_storeid_rewrite_helpers list containing double entries.
 
 #define list of modules to build
+auto_storeid_modules=no
 if test "x${enable_storeid_rewrite_helpers:=yes}" = "xyes" ; then
     SQUID_LOOK_FOR_MODULES([$srcdir/helpers/storeid_rewrite],[enable_storeid_rewrite_helpers])
+  auto_storeid_modules=yes
 fi
 
 enable_storeid_rewrite_helpers="`echo $enable_storeid_rewrite_helpers| sed -e 's/,/ /g;s/  */ /g'`"
@@ -34,7 +36,11 @@ if test "x$enable_storeid_rewrite_helpers" != "xno" ; then
 
     if test -d "$srcdir/helpers/storeid_rewrite/$helper"; then
       if test "$BUILD_HELPER" != "$helper"; then
-        AC_MSG_NOTICE([Store-ID rewrite helper $helper ... found but cannot be built])
+        if test "x$auto_storeid_modules" = "xyes"; then
+          AC_MSG_NOTICE([Store-ID rewrite helper $helper ... found but cannot be built])
+        else
+          AC_MSG_ERROR([Store-ID rewrite helper $helper ... found but cannot be built])
+        fi
       else
         STOREID_REWRITE_HELPERS="$STOREID_REWRITE_HELPERS $BUILD_HELPER"
       fi
diff --git a/helpers/url_rewrite/modules.m4 b/helpers/url_rewrite/modules.m4
index 31a5cf8a12..af097bd8f4 100644
--- a/helpers/url_rewrite/modules.m4
+++ b/helpers/url_rewrite/modules.m4
@@ -11,8 +11,10 @@
 # FIXME: de-duplicate $enable_url_rewrite_helpers list containing double entries.
 
 #define list of modules to build
+auto_urlrewrite_modules=no
 if test "x${enable_url_rewrite_helpers:=yes}" = "xyes" ; then
     SQUID_LOOK_FOR_MODULES([$srcdir/helpers/url_rewrite],[enable_url_rewrite_helpers])
+  auto_urlrewrite_modules=yes
 fi
 
 enable_url_rewrite_helpers="`echo $enable_url_rewrite_helpers| sed -e 's/,/ /g;s/  */ /g'`"
@@ -37,7 +39,11 @@ if test "x$enable_url_rewrite_helpers" != "xno" ; then
 
     if test -d "$srcdir/helpers/url_rewrite/$helper"; then
       if test "$BUILD_HELPER" != "$helper"; then
-        AC_MSG_NOTICE([URL rewrite helper $helper ... found but cannot be built])
+        if test "x$auto_urlrewrite_modules" = "xyes"; then
+          AC_MSG_NOTICE([URL rewrite helper $helper ... found but cannot be built])
+        else
+          AC_MSG_ERROR([URL rewrite helper $helper ... found but cannot be built])
+        fi
       else
         URL_REWRITE_HELPERS="$URL_REWRITE_HELPERS $BUILD_HELPER"
       fi