Refactored --enable-external-acl-helpers

diff --git a/configure.in b/configure.in
index c7587c45a85ca31090edf4f1c52d30938c7865dd..657811f977ee94811db2fb481b697d2be3541cb0 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1499,7 +1499,7 @@ AC_ARG_ENABLE(auth-basic,
       Not providing an explicit list of helpers will attempt build of
       all possible helpers. Default is to do so.
       To disable the basic authentication scheme, use --disable-auth-basic.
-      To enable but build no helpers, provide an empty list.
+      To enable but build no helpers, specify "none".
       To see available helpers, see the helpers/basic_auth directory. ]),[
 #nothing to do really
 ])
@@ -1846,51 +1846,48 @@ AC_ARG_ENABLE(ntlm-fail-open,
   AS_HELP_STRING([--enable-ntlm-fail-open],
                       [Enable NTLM fail open, where a helper that fails one of the
                   Authentication steps can allow squid to still authenticate
-                  the user. This has security implications.]), [ 
-  if test "$enableval" = "yes" ; then
-    AC_DEFINE(NTLM_FAIL_OPEN,1,
-          [Define if NTLM is allowed to fail gracefully when a helper has problems.])
-  fi
+                  the user. This has security implications, and is deprecated]),
+[ 
+SQUID_YESNO([$enableval],[--enable-ntlm-fail-open takes no argument])
 ])
+SQUID_DEFINE_UNQUOTED(NTLM_FAIL_OPEN,${enable_ntlm_fail_open:=no},
+  [Define if NTLM is allowed to fail gracefully when a helper has problems.])
+AC_MSG_NOTICE([ntlm-fail-open enabled: $enable_ntlm_fail_open])
 
-dnl Select external_acl helpers to build
-EXTERNAL_ACL_HELPERS=""
-squid_opt_external_acl_helpers="auto"
 AC_ARG_ENABLE(external-acl-helpers,
   AS_HELP_STRING([--enable-external-acl-helpers="list of helpers"],
-                 [This option selects which external_acl helpers to
-                  build and install as part of the normal build
-                  process. For a list of available helpers see the
-                  helpers/external_acl directory.]),
-[ case "$enableval" in
-  yes)
-    squid_opt_external_acl_helpers="auto"
-       ;;
-  no)
-       squid_opt_external_acl_helpers=""
-       ;;
-  *)
-       squid_opt_external_acl_helpers="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
-       ;;
-  esac
+                      [Enable external_acl helpers support and thelpers themselves.
+                  Default is to build all buildable helpers and enable support.
+                                                                       To disable support, use --disable-external-acl-helpers.
+                  To build no helpers, specify "none".
+                                                                       To see available helpers, see the helpers/external_acl
+                                                                       directory]), [
+#nothing to do, really
 ])
-if test "$squid_opt_external_acl_helpers" = "auto" ; then
-       squid_opt_external_acl_helpers=""
-    SQUID_LOOK_FOR_MODULES([$srcdir/helpers/external_acl],[squid_opt_external_acl_helpers])
+if test "x${enable_external_acl_helpers:=yes}" = "xyes" ;then
+       SQUID_LOOK_FOR_MODULES([$srcdir/helpers/external_acl],
+                              [enable_external_acl_helpers])
 fi
-if test -n "$squid_opt_external_acl_helpers"; then
-    for helper in $squid_opt_external_acl_helpers; do
-        dir="$srcdir/helpers/external_acl/$helper"
-        if test -f $dir/config.test && sh $dir/config.test "$@"; then
-            EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS $helper"
-        else
-            AC_MSG_NOTICE([external acl helper $helper ... found but cannot be built])
-        fi
-    done
+if test "x$enable_external_acl_helpers" = "xnone" ; then
+       enable_external_acl_helpers=""
+fi
+EXTERNAL_ACL_HELPERS=""
+enable_external_acl_helpers="`echo $enable_external_acl_helpers| sed -e 's/,/ /g;s/  */ /g'`"
+if test "x$enable_external_acl_helpers" != "xno" ; then
+  for helper in $enable_external_acl_helpers ; do
+    dir="$srcdir/helpers/external_acl/$helper"
+               if test -f $dir/config.test && sh $dir/config.test "$@"; then
+                       EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS $helper"
+               else
+                       AC_MSG_NOTICE([external acl helper $helper ... found but cannot be built])
+               fi
+       done
 fi
 AC_MSG_NOTICE([External acl helpers built: $EXTERNAL_ACL_HELPERS])
 AC_SUBST(EXTERNAL_ACL_HELPERS)
 
+
+
 dnl Select url_rewrite helpers to build
 URL_REWRITE_HELPERS=all
 AC_ARG_ENABLE(url-rewrite-helpers,