auth_rewrite merge

The configure variable for basic auth helpers renamed to BASIC_AUTH_HELPERS
in order to keep a consistent naming convention

diff --git a/configure b/configure
index 67e0352a89f24377544784616d4cc612ecfe4bfc..cddc387ff2327cacf3426cd62bdaa201f27b938f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1797,14 +1797,14 @@ if test "${enable_auth_modules+set}" = set; then
   yes) 
     for helper in $srcdir/src/auth/basic/helpers/*; do
        if test -f $helper/Makefile.in; then
-           AUTH_BASIC_HELPERS="$AUTH_BASIC_HELPERS `basename $helper`"
+           BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`"
        fi
     done
     ;;
   no)
     ;;
   *)
-    AUTH_BASIC_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
+    BASIC_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
   esac
 
 fi
@@ -1817,20 +1817,20 @@ if test "${enable_basic_auth_helpers+set}" = set; then
     BASIC_AUTH_HELPERS=""
     for helper in $srcdir/src/auth/basic/helpers/*; do
        if test -f $helper/Makefile.in; then
-           AUTH_BASIC_HELPERS="$AUTH_BASIC_HELPERS `basename $helper`"
+           BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`"
        fi
     done
     ;;
   no)
     ;;
   *)
-    AUTH_BASIC_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
+    BASIC_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
   esac
 
 fi
 
-if test -n "$AUTH_BASIC_HELPERS"; then
-    echo "Basic auth helpers built: $AUTH_BASIC_HELPERS"
+if test -n "$BASIC_AUTH_HELPERS"; then
+    echo "Basic auth helpers built: $BASIC_AUTH_HELPERS"
 fi
 
 
@@ -5788,7 +5788,7 @@ s%@DNS_OBJS@%$DNS_OBJS%g
 s%@AUTH_MODULES@%$AUTH_MODULES%g
 s%@AUTH_OBJS@%$AUTH_OBJS%g
 s%@AUTH_LIBS@%$AUTH_LIBS%g
-s%@AUTH_BASIC_HELPERS@%$AUTH_BASIC_HELPERS%g
+s%@BASIC_AUTH_HELPERS@%$BASIC_AUTH_HELPERS%g
 s%@NTLM_AUTH_HELPERS@%$NTLM_AUTH_HELPERS%g
 s%@OPT_UNLINKD_EXE@%$OPT_UNLINKD_EXE%g
 s%@UNLINKD_OBJS@%$UNLINKD_OBJS%g

diff --git a/configure.in b/configure.in
index e90a5e9c1f2334ec153860adb8c9a08d3d69ffe3..144675cca27cdd35efbf99124ea5849b46308c1a 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.213 2001/01/10 21:07:07 hno Exp $
+dnl  $Id: configure.in,v 1.214 2001/01/10 23:55:56 hno Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.213 $)dnl
+AC_REVISION($Revision: 1.214 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -723,14 +723,14 @@ AC_ARG_ENABLE(auth-modules,
   yes) 
     for helper in $srcdir/src/auth/basic/helpers/*; do
        if test -f $helper/Makefile.in; then
-           AUTH_BASIC_HELPERS="$AUTH_BASIC_HELPERS `basename $helper`"
+           BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`"
        fi
     done
     ;;
   no)
     ;;
   *)
-    AUTH_BASIC_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
+    BASIC_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
   esac
 ])
 AC_ARG_ENABLE(basic-auth-helpers,
@@ -744,20 +744,20 @@ AC_ARG_ENABLE(basic-auth-helpers,
     BASIC_AUTH_HELPERS=""
     for helper in $srcdir/src/auth/basic/helpers/*; do
        if test -f $helper/Makefile.in; then
-           AUTH_BASIC_HELPERS="$AUTH_BASIC_HELPERS `basename $helper`"
+           BASIC_AUTH_HELPERS="$BASIC_AUTH_HELPERS `basename $helper`"
        fi
     done
     ;;
   no)
     ;;
   *)
-    AUTH_BASIC_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
+    BASIC_AUTH_HELPERS="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
   esac
 ])
-if test -n "$AUTH_BASIC_HELPERS"; then
-    echo "Basic auth helpers built: $AUTH_BASIC_HELPERS"
+if test -n "$BASIC_AUTH_HELPERS"; then
+    echo "Basic auth helpers built: $BASIC_AUTH_HELPERS"
 fi
-AC_SUBST(AUTH_BASIC_HELPERS)
+AC_SUBST(BASIC_AUTH_HELPERS)
 
 dnl Select ntlm auth helpers to build
 NTLM_AUTH_HELPERS=

diff --git a/helpers/basic_auth/Makefile.in b/helpers/basic_auth/Makefile.in
index b7b3fe6b60c03650630bbeb25b44174a06bb053e..f11985d53988e3fbfcbe0d5502a8babc95d62e4d 100644 (file)
--- a/helpers/basic_auth/Makefile.in
+++ b/helpers/basic_auth/Makefile.in
@@ -1,12 +1,12 @@
 #  Makefile for storage modules in the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.1 2001/01/07 23:36:43 hno Exp $
+#  $Id: Makefile.in,v 1.2 2001/01/10 23:55:59 hno Exp $
 #
 
 # The 'nop' is in the SUBDIRS list because some Unixes that can't
 # handle empty for lists.
 
-SUBDIRS                = @AUTH_BASIC_HELPERS@ nop
+SUBDIRS                = @BASIC_AUTH_HELPERS@ nop
 
 all:
        @for dir in $(SUBDIRS); do \