Always generate all auth scheme/helpres Makefiles.

(also rewritten to be generic for all schemes)

diff --git a/configure.in b/configure.in
index 885b32fda5067e16fcfec86e926cc06499acc5d4..e90a5e9c1f2334ec153860adb8c9a08d3d69ffe3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,13 +3,13 @@ dnl  Configuration input file for Squid
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.212 2001/01/07 23:36:27 hno Exp $
+dnl  $Id: configure.in,v 1.213 2001/01/10 21:07:07 hno Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.212 $)dnl
+AC_REVISION($Revision: 1.213 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -1794,33 +1794,23 @@ for repl in $REPL_POLICIES none; do
        fi
 done
 
-AUTH_SCHEME_MAKEFILES=""
-for auth in $AUTH_MODULES none; do
-        if test $auth != none; then
-            AUTH_SCHEME_MAKEFILES="$AUTH_SCHEME_MAKEFILES ./src/auth/$auth/Makefile"
-        fi
-done
-
-BASIC_AUTH_MAKEFILES=""
-for helper in $srcdir/src/auth/basic/helpers/*; do
-       if test -f $helper/Makefile.in; then
-           BASIC_AUTH_MAKEFILES="$BASIC_AUTH_MAKEFILES ./src/auth/basic/helpers/`basename $helper`/Makefile"
-       fi
-done
+AUTH_MAKEFILES=""
+for auth in $srcdir/src/auth/* none; do
+       if test -f $auth/Makefile.in; then
+           scheme=`basename $auth`
+            AUTH_MAKEFILES="$AUTH_MAKEFILES ./src/auth/$scheme/Makefile"
+           if test -f $auth/helpers/Makefile.in; then
+               AUTH_MAKEFILES="$AUTH_MAKEFILES ./src/auth/$scheme/helpers/Makefile"
+               for helper in $auth/helpers/*; do
+                   if test -f $helper/Makefile.in; then
+                       AUTH_MAKEFILES="$AUTH_MAKEFILES ./src/auth/$scheme/helpers/`basename $helper`/Makefile"
+                   fi
+               done
+           fi
 
-NTLM_AUTH_MAKEFILES=""
-for helper in $srcdir/src/auth/ntlm/helpers/*; do
-        if test -f $helper/Makefile.in; then
-            NTLM_AUTH_MAKEFILES="$NTLM_AUTH_MAKEFILES ./src/auth/ntlm/helpers/`basename $helper`/Makefile"
-           for submodule in $helper/*; do
-               if test -f $submodule/Makefile.in; then
-                     NTLM_AUTH_MAKEFILES="$NTLM_AUTH_MAKEFILES ./src/auth/ntlm/helpers/`basename $helper`/`basename $submodule`/Makefile"
-               fi
-           done
         fi
 done
 
-
 AC_OUTPUT(\
        ./makefile \
        ./lib/Makefile \
@@ -1834,11 +1824,7 @@ AC_OUTPUT(\
        ./src/repl/Makefile \
        $REPL_MAKEFILES \
        ./src/auth/Makefile \
-       $AUTH_SCHEME_MAKEFILES \
-       ./src/auth/basic/helpers/Makefile \
-       $BASIC_AUTH_MAKEFILES \
-       ./src/auth/ntlm/helpers/Makefile \
-       $NTLM_AUTH_MAKEFILES \
+       $AUTH_MAKEFILES \
        ./contrib/Makefile \
        $SNMP_MAKEFILE \
        ./icons/Makefile \