--------------------- PatchSet 1147 Date: 2001/01/07 07:22:03 Author: hno Branch: auth_rewrite Tag: (none) Log: Changed default to only Basic scheme --enable-auth-modules backward compability alias option Members: configure.in:1.1.1.3.10.17.2.9->1.1.1.3.10.17.2.10 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.1.1.3.10.17.2.9 retrieving revision 1.1.1.3.10.17.2.10 diff -u -r1.1.1.3.10.17.2.9 -r1.1.1.3.10.17.2.10 --- squid/configure.in 7 Jan 2001 02:44:54 -0000 1.1.1.3.10.17.2.9 +++ squid/configure.in 7 Jan 2001 07:22:03 -0000 1.1.1.3.10.17.2.10 @@ -3,13 +3,13 @@ dnl dnl Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9) dnl -dnl $Id: configure.in,v 1.1.1.3.10.17.2.9 2001/01/07 02:44:54 rbcollins Exp $ +dnl $Id: configure.in,v 1.1.1.3.10.17.2.10 2001/01/07 07:22:03 hno Exp $ dnl dnl dnl AC_INIT(src/main.c) AC_CONFIG_HEADER(include/autoconf.h) -AC_REVISION($Revision: 1.1.1.3.10.17.2.9 $)dnl +AC_REVISION($Revision: 1.1.1.3.10.17.2.10 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AC_CONFIG_AUX_DIR(cfgaux) @@ -680,7 +680,7 @@ AC_ARG_ENABLE(auth, [ --enable-auth=\"list of auth scheme modules\" Build support for the list of authentication schemes. - The default is build Basic and NTLM schemes. + The default is to build support for the Basic scheme. See src/auth for a list of available modules, or Programmers Guide section authentication schemes for details on how to build your custom auth scheme @@ -700,7 +700,7 @@ esac ], [ if test -z "$AUTH_MODULES"; then - AUTH_MODULES="basic ntlm" + AUTH_MODULES="basic" fi ]) echo "Auth scheme modules built: $AUTH_MODULES" @@ -711,15 +711,37 @@ AC_SUBST(AUTH_LIBS) dnl Select basic auth scheme modules to build -AUTH_BASIC_MODULES= +BASIC_AUTH_MODULES="" +AC_ARG_ENABLE(auth-modules, +[ --enable-auth-modules=\"list of helpers\" + Backwards compability alias for + --enable-basic-auth-modules], +[ echo "--enable-auth-modules is obsolete. Please use the new" + echo "option --enable-basic-auth-modules" + sleep 5 + case "$enableval" in + yes) + for module in $srcdir/auth_modules/*; do + if test -f $module/Makefile.in; then + AUTH_BASIC_MODULES="$AUTH_BASIC_MODULES `basename $module`" + fi + done + ;; + no) + ;; + *) + AUTH_BASIC_MODULES="`echo $enableval| sed -e 's/,/ /g;s/ */ /g'`" + esac +]) AC_ARG_ENABLE(basic-auth-modules, -[ --enable-basic-auth-modules=\"list of modules\" - This option selects which basic scheme proxy_auth - helper modules to build and install as part of the - normal build process. For a list of available modules - see the auth_modules directory.], +[ --enable-basic-auth-modules=\"list of helpers\" + This option selects which basic scheme proxy_auth + helper modules to build and install as part of + the normal build process. For a list of available + helpers see the auth_modules directory.], [ case "$enableval" in yes) + BASIC_AUTH_MODULES="" for module in $srcdir/auth_modules/*; do if test -f $module/Makefile.in; then AUTH_BASIC_MODULES="$AUTH_BASIC_MODULES `basename $module`" @@ -742,8 +764,8 @@ AC_ARG_ENABLE(ntlm-auth-modules, [ --enable-ntlm-auth-modules=\"list of modules\" This option selects which proxy_auth ntlm helper - modules to build and install as part of the normal - build process. For a list of available modules see + modules to build and install as part of the normal + build process. For a list of available modules see the ntlm_auth_modules directory.], [ case "$enableval" in yes)