Bootstrapped

diff --git a/configure b/configure
index c76d1a8f10d505eec27a4df1b16a65ca8d979741..790fd585b502f02b3f0fa9fb9edf7b28acf64416 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.394 .
+# From configure.in Revision: 1.395 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59.
 #
@@ -22136,6 +22136,7 @@ if test -n "$AUTH_MODULES"; then
            echo "ERROR: Auth scheme $module does not exists"
            exit 1
        fi
+       eval AUTH_MODULE_${module}=yes
     done
     echo "Auth scheme modules built: $AUTH_MODULES"
     AUTH_OBJS="auth/lib`echo $AUTH_MODULES|sed -e 's% %.a auth/lib%g'`.a"
@@ -22150,27 +22151,38 @@ done
 
 
 
-BASIC_AUTH_HELPERS=""
+if test -n "$AUTH_MODULE_basic"; then
+       BASIC_AUTH_HELPERS="all"
+fi
 # Check whether --enable-basic-auth-helpers or --disable-basic-auth-helpers was given.
 if test "${enable_basic_auth_helpers+set}" = set; then
   enableval="$enable_basic_auth_helpers"
    case "$enableval" in
   yes)
-       for dir in $srcdir/helpers/basic_auth/*; do
-           helper="`basename $dir`"
-           if test -f $dir/config.test && sh $dir/config.test "$@"; then
-               BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS $helper"
-           fi
-       done
+       BASIC_AUTH_HELPERS="all"
        ;;
   no)
+       BASIC_AUTH_HELPERS=""
        ;;
   *)
+       if test -z "$AUTH_MODULE_basic"; then
+               echo "WARNING: Basic auth helpers selected without the basic scheme enabled"
+               sleep 15
+       fi
        BASIC_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
        ;;
   esac
 
 fi;
+if test "$BASIC_AUTH_HELPERS" = "all" ; then
+       BASIC_AUTH_HELPERS=""
+       for dir in $srcdir/helpers/basic_auth/*; do
+           helper="`basename $dir`"
+           if test -f $dir/config.test && sh $dir/config.test "$@"; then
+               BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS $helper"
+           fi
+       done
+fi
 if test -n "$BASIC_AUTH_HELPERS"; then
     for helper in $BASIC_AUTH_HELPERS; do
        if test -d $srcdir/helpers/basic_auth/$helper; then
@@ -22188,20 +22200,18 @@ if test -n "$BASIC_AUTH_HELPERS"; then
 fi
 
 
-NTLM_AUTH_HELPERS=
+if test -n "$AUTH_MODULE_ntlm"; then
+       NTLM_AUTH_HELPERS="all"
+fi
 # Check whether --enable-ntlm-auth-helpers or --disable-ntlm-auth-helpers was given.
 if test "${enable_ntlm_auth_helpers+set}" = set; then
   enableval="$enable_ntlm_auth_helpers"
    case "$enableval" in
   yes)
-       for dir in $srcdir/helpers/ntlm_auth/*; do
-           helper="`basename $dir`"
-           if test -f $dir/config.test && sh $dir/config.test "$@"; then
-               NTLM_AUTH_HELPERS="$NTLM_AUTH_HELPERS $helper"
-           fi
-       done
+       NTLM_AUTH_HELPERS="all"
        ;;
   no)
+       NTLM_AUTH_HELPERS=""
        ;;
   *)
        NTLM_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
@@ -22209,6 +22219,15 @@ if test "${enable_ntlm_auth_helpers+set}" = set; then
   esac
 
 fi;
+if test "$NTLM_AUTH_HELPERS" = "all" ; then
+       NTLM_AUTH_HELPERS=""
+       for dir in $srcdir/helpers/ntlm_auth/*; do
+           helper="`basename $dir`"
+           if test -f $dir/config.test && sh $dir/config.test "$@"; then
+               NTLM_AUTH_HELPERS="$NTLM_AUTH_HELPERS $helper"
+           fi
+       done
+fi
 if test -n "$NTLM_AUTH_HELPERS"; then
     for helper in $NTLM_AUTH_HELPERS; do
        if test -d $srcdir/helpers/ntlm_auth/$helper; then
@@ -22222,20 +22241,18 @@ if test -n "$NTLM_AUTH_HELPERS"; then
 fi
 
 
-NEGOTIATE_AUTH_HELPERS=
+if test -n "$AUTH_MODULE_negotiate"; then
+       NEGOTIATE_AUTH_HELPERS="all"
+fi
 # Check whether --enable-negotiate-auth-helpers or --disable-negotiate-auth-helpers was given.
 if test "${enable_negotiate_auth_helpers+set}" = set; then
   enableval="$enable_negotiate_auth_helpers"
    case "$enableval" in
   yes)
-       for dir in $srcdir/helpers/negotiate_auth/*; do
-           helper="`basename $dir`"
-           if test -f $dir/config.test && sh $dir/config.test "$@";  then
-               NEGOTIATE_AUTH_HELPERS="$NEGOTIATE_AUTH_HELPERS $helper"
-           fi
-       done
+       NEGOTIATE_AUTH_HELPERS="all"
        ;;
   no)
+       NEGOTIATE_AUTH_HELPERS=""
        ;;
   *)
        NEGOTIATE_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
@@ -22243,6 +22260,15 @@ if test "${enable_negotiate_auth_helpers+set}" = set; then
   esac
 
 fi;
+if test "$NEGOTIATE_AUTH_HELPERS" = "all" ; then
+       NEGOTIATE_AUTH_HELPERS=""
+       for dir in $srcdir/helpers/negotiate_auth/*; do
+           helper="`basename $dir`"
+           if test -f $dir/config.test && sh $dir/config.test "$@";  then
+               NEGOTIATE_AUTH_HELPERS="$NEGOTIATE_AUTH_HELPERS $helper"
+           fi
+       done
+fi
 if test -n "$NEGOTIATE_AUTH_HELPERS"; then
     for helper in $NEGOTIATE_AUTH_HELPERS; do
        if test -d $srcdir/helpers/negotiate_auth/$helper; then
@@ -22256,20 +22282,18 @@ if test -n "$NEGOTIATE_AUTH_HELPERS"; then
 fi
 
 
-DIGEST_AUTH_HELPERS=
+if test -n "$AUTH_MODULE_digest"; then
+       DIGEST_AUTH_HELPERS=all
+fi
 # Check whether --enable-digest-auth-helpers or --disable-digest-auth-helpers was given.
 if test "${enable_digest_auth_helpers+set}" = set; then
   enableval="$enable_digest_auth_helpers"
    case "$enableval" in
   yes)
-       for dir in $srcdir/helpers/digest_auth/*; do
-           helper="`basename $dir`"
-           if test -f $dir/config.test && sh $dir/config.test "$@"; then
-               DIGEST_AUTH_HELPERS="$DIGEST_AUTH_HELPERS $helper"
-           fi
-       done
+       DIGEST_AUTH_HELPERS="all"
        ;;
   no)
+       DIGEST_AUTH_HELPERS=""
        ;;
   *)
        DIGEST_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
@@ -22277,6 +22301,15 @@ if test "${enable_digest_auth_helpers+set}" = set; then
   esac
 
 fi;
+if test "$DIGEST_AUTH_HELPERS" = "all" ; then
+       DIGEST_AUTH_HELPERS=""
+       for dir in $srcdir/helpers/digest_auth/*; do
+           helper="`basename $dir`"
+           if test -f $dir/config.test && sh $dir/config.test "$@"; then
+               DIGEST_AUTH_HELPERS="$DIGEST_AUTH_HELPERS $helper"
+           fi
+       done
+fi
 if test -n "$DIGEST_AUTH_HELPERS"; then
     for helper in $DIGEST_AUTH_HELPERS; do
        if test -f $srcdir/helpers/digest_auth/$helper/Makefile.in; then
@@ -22303,20 +22336,16 @@ _ACEOF
 
 fi;
 
-EXTERNAL_ACL_HELPERS=
+EXTERNAL_ACL_HELPERS=all
 # Check whether --enable-external-acl-helpers or --disable-external-acl-helpers was given.
 if test "${enable_external_acl_helpers+set}" = set; then
   enableval="$enable_external_acl_helpers"
    case "$enableval" in
   yes)
-       for dir in $srcdir/helpers/external_acl/*; do
-           helper="`basename $dir`"
-           if test -f $dir/config.test && sh $dir/config.test "$@"; then
-               EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS $helper"
-           fi
-       done
+       EXTERNAL_ACL_HELPERS=all
        ;;
   no)
+       EXTERNAL_ACL_HELPERS=""
        ;;
   *)
        EXTERNAL_ACL_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
@@ -22324,6 +22353,14 @@ if test "${enable_external_acl_helpers+set}" = set; then
   esac
 
 fi;
+if test "$EXTERNAL_ACL_HELPERS" = "all" ; then
+       for dir in $srcdir/helpers/external_acl/*; do
+           helper="`basename $dir`"
+           if test -f $dir/config.test && sh $dir/config.test "$@"; then
+               EXTERNAL_ACL_HELPERS="$EXTERNAL_ACL_HELPERS $helper"
+           fi
+       done
+fi
 if test -n "$EXTERNAL_ACL_HELPERS"; then
     for helper in $EXTERNAL_ACL_HELPERS; do
        if test -f $srcdir/helpers/external_acl/$helper/Makefile.in; then

diff --git a/helpers/digest_auth/ldap/Makefile.in b/helpers/digest_auth/ldap/Makefile.in
index dc42218f8b94c338b3bb034ed7db7e7543a8152a..e2f270d4e151f4d54610adb5b97eaddb9cd10379 100644 (file)
--- a/helpers/digest_auth/ldap/Makefile.in
+++ b/helpers/digest_auth/ldap/Makefile.in
@@ -17,7 +17,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.2 2005/12/29 02:22:27 hno Exp $
+#  $Id: Makefile.in,v 1.3 2005/12/29 02:43:41 hno Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -58,8 +58,9 @@ CONFIG_CLEAN_FILES =
 am__installdirs = "$(DESTDIR)$(libexecdir)"
 libexecPROGRAMS_INSTALL = $(INSTALL_PROGRAM)
 PROGRAMS = $(libexec_PROGRAMS)
-digest_ldap_auth_SOURCES = digest_ldap_auth.c
-digest_ldap_auth_OBJECTS = digest_ldap_auth.$(OBJEXT)
+am_digest_ldap_auth_OBJECTS = digest_pw_auth.$(OBJEXT) \
+       ldap_backend.$(OBJEXT)
+digest_ldap_auth_OBJECTS = $(am_digest_ldap_auth_OBJECTS)
 digest_ldap_auth_LDADD = $(LDADD)
 am__DEPENDENCIES_1 =
 digest_ldap_auth_DEPENDENCIES = $(am__DEPENDENCIES_1) \
@@ -76,8 +77,8 @@ LTCOMPILE = $(LIBTOOL) --tag=CC --mode=compile $(CC) $(DEFS) \
 CCLD = $(CC)
 LINK = $(LIBTOOL) --tag=CC --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
        $(AM_LDFLAGS) $(LDFLAGS) -o $@
-SOURCES = digest_ldap_auth.c
-DIST_SOURCES = digest_ldap_auth.c
+SOURCES = $(digest_ldap_auth_SOURCES)
+DIST_SOURCES = $(digest_ldap_auth_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -269,7 +270,7 @@ sharedstatedir = @sharedstatedir@
 subdirs = @subdirs@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-digest_pw_auth_SOURCES = digest_pw_auth.c \
+digest_ldap_auth_SOURCES = digest_pw_auth.c \
        digest_common.h \
        ldap_backend.c \
        ldap_backend.h
@@ -349,7 +350,8 @@ mostlyclean-compile:
 distclean-compile:
        -rm -f *.tab.c
 
-@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/digest_ldap_auth.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/digest_pw_auth.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ldap_backend.Po@am__quote@
 
 .c.o:
 @am__fastdepCC_TRUE@   if $(COMPILE) -MT $@ -MD -MP -MF "$(DEPDIR)/$*.Tpo" -c -o $@ $<; \