Fixed some indentation.

Refactored URL rewrite helpers handling.

diff --git a/configure.in b/configure.in
index 6bcae6cf152557623246a146e3a245a7f3702cc8..6534dd2627a782287aaaed7d4491fd7eab6455e5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1457,7 +1457,8 @@ AM_CONDITIONAL([USE_DNSSERVER],[test "$squid_opt_use_dnsserver" = "yes" ])
 
 dnl Select Default hosts file location
 AC_ARG_ENABLE(default-hostsfile,
-  AS_HELP_STRING([--enable-default-hostsfile=path],[Select default location for hosts file.
+  AS_HELP_STRING([--enable-default-hostsfile=path],
+                 [Select default location for hosts file.
                   See hosts_file directive in squid.conf for details]),
 [
   if test "$enableval" != "none" -a "$enableval" != "no" ; then
@@ -1849,12 +1850,12 @@ AC_MSG_NOTICE([ntlm-fail-open enabled: $enable_ntlm_fail_open])
 
 AC_ARG_ENABLE(external-acl-helpers,
   AS_HELP_STRING([--enable-external-acl-helpers="list of helpers"],
-                      [Enable external_acl helpers support and thelpers themselves.
+                 [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 disable support, use --disable-external-acl-helpers.
                   To build no helpers, specify "none".
-                                                                       To see available helpers, see the helpers/external_acl
-                                                                       directory]), [
+                  To see available helpers, see the helpers/external_acl
+                  directory]), [
 #nothing to do, really
 ])
 if test "x${enable_external_acl_helpers:=yes}" = "xyes" ;then
@@ -1882,46 +1883,35 @@ AC_SUBST(EXTERNAL_ACL_HELPERS)
 
 
 dnl Select url_rewrite helpers to build
-URL_REWRITE_HELPERS=all
 AC_ARG_ENABLE(url-rewrite-helpers,
   AC_HELP_STRING([--enable-url-rewrite-helpers="list of helpers"],
                  [This option selects which url_rewrite helpers to
                   build and install as part of the normal build
-                  process. For a list of available helpers see the
-                  helpers/url_rewrite directory.]),
-[ case "$enableval" in
-  yes)
-       URL_REWRITE_HELPERS=all
-       ;;
-  no)
-       URL_REWRITE_HELPERS=""
-       ;;
-  *)
-       URL_REWRITE_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
-       ;;
-  esac
-])
-if test "$URL_REWRITE_HELPERS" = "all" ; then
-       URL_REWRITE_HELPERS=""
-       for dir in $srcdir/helpers/url_rewrite/*; do
-           helper="`basename $dir`"
-           if test -f $dir/config.test && sh $dir/config.test "$@"; then
-               URL_REWRITE_HELPERS="$URL_REWRITE_HELPERS $helper"
-            elif test -d $srcdir/helpers/url_rewrite/$helper ; then
-                AC_MSG_NOTICE([URL re-write helper $helper ... found but cannot be built])
-           fi
-       done
-fi
-if test -n "$URL_REWRITE_HELPERS"; then
-    for helper in $URL_REWRITE_HELPERS; do
-       if test -f $srcdir/helpers/url_rewrite/$helper/Makefile.in; then
-               :
-       else
-               AC_MSG_ERROR(url_rewrite helper $helper does not exist)
-       fi
-    done
-    AC_MSG_NOTICE([url_rewrite helpers built: $URL_REWRITE_HELPERS])
+                  process. The default is to attempt the build of all possible
+                  helpers. Use --disable-url-rewrite-helpers to build none.
+                  For a list of available helpers see the
+                  helpers/url_rewrite directory.]),[
+])
+if test "x${enable_url_rewrite_helpers:=yes}" = "xyes" ; then
+    SQUID_LOOK_FOR_MODULES([$srcdir/helpers/url_rewrite],
+                           [enable_url_rewrite_helpers])
+fi
+enable_url_rewrite_helpers="`echo $enable_url_rewrite_helpers| sed -e 's/,/ /g;s/  */ /g'`"
+AC_MSG_NOTICE([URL rewrite helper candidates: $enable_url_rewrite_helpers])
+URL_REWRITE_HELPERS=""
+if test "x$enable_url_rewrite_helpers" != "xno" ; then
+  for helper in $enable_url_rewrite_helpers; do
+    dir="$srcdir/helpers/url_rewrite/$helper"
+    if test -f $dir/config.test && sh $dir/config.test "$@"; then
+      URL_REWRITE_HELPERS="$URL_REWRITE_HELPERS $helper"
+    elif test -d $srcdir/helpers/ntlm_auth/$helper ; then
+      AC_MSG_NOTICE([URL rewrite helper $helper ... found but cannot be built])
+    else
+      AC_MSG_NOTICE([URL rewrite helper $helper ... not found])
+    fi
+  done
 fi
+AC_MSG_NOTICE([URL rewrite helpers built: $URL_REWRITE_HELPERS])
 AC_SUBST(URL_REWRITE_HELPERS)