---------------------
PatchSet 1606 
Date: 2001/02/18 08:29:57
Author: rbcollins
Branch: rbcollins_filters
Tag: (none) 
Log:
merge module code from generic_modules

Members: 
	configure.in:1.1.1.3.8.11.2.5->1.1.1.3.8.11.2.6 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.1.1.3.8.11.2.5
retrieving revision 1.1.1.3.8.11.2.6
diff -u -r1.1.1.3.8.11.2.5 -r1.1.1.3.8.11.2.6
--- squid/configure.in	18 Feb 2001 08:13:44 -0000	1.1.1.3.8.11.2.5
+++ squid/configure.in	18 Feb 2001 08:29:57 -0000	1.1.1.3.8.11.2.6
@@ -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.8.11.2.5 2001/02/18 08:13:44 rbcollins Exp $
+dnl  $Id: configure.in,v 1.1.1.3.8.11.2.6 2001/02/18 08:29:57 rbcollins Exp $
 dnl
 dnl
 dnl
 AC_INIT(src/main.c)
 AC_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.1.1.3.8.11.2.5 $)dnl
+AC_REVISION($Revision: 1.1.1.3.8.11.2.6 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -824,36 +824,6 @@
 fi
 AC_SUBST(DIGEST_AUTH_HELPERS)
 
-dnl we may inherit preset CONF_MODULES from AUTH & FS & REPL above
-AC_ARG_ENABLE(modules,
-[  --enable-modules=\"list of modules\"
-                          This option selects which generic modules to build.
-                          Generic modules can plugin into several parts of squid
-                          and autoregister their capabilities with squid. For a list
-                          of available modules see the src/modules directory.],
-[ case "$enableval" in
-  yes)
-    for module in $srcdir/src/modules/*; do
-	if test -f $module/Makefile.in; then
-	    CONF_MODULES="$CONF_MODULES `basename $module`"
-	fi
-    done
-    ;;
-  no)
-    ;;
-  *)
-    CONF_MODULES="`echo $enableval|sed -e 's/,/ /g;s/  */ /g'`"
-  esac
-])
-if test -n "$CONF_MODULES"; then
-    echo "Generic modules built: $CONF_MODULES"
-    AC_SUBST(CONF_MODULES)
-    CONF_MODULE_OBJS="modules/`echo $CONF_MODULES|sed -e's% %.a modules/%g'`.a"
-    AC_SUBST(CONF_MODULE_OBJS)
-    CONF_MODULE_LIBS="`echo $CONF_MODULE_OBJS|sed -e's%module/%%g'`"
-    AC_SUBST(CONF_MODULE_LIBS)
-fi
-
 dnl Select generic modules to build
 dnl we may inherit preset CONF_MODULES from AUTH & FS & REPL above
 AC_ARG_ENABLE(modules,
@@ -1910,15 +1880,6 @@
 done
 
 
-MOD_MAKEFILES=""
-for module in `find $srcdir/src/modules -type d -print`; do
-        if test -f $module/Makefile.in; then
-            dir=`echo $module | sed -e "s|^$srcdir/||"`
-            MOD_MAKEFILES="$MOD_MAKEFILES ./$dir/Makefile"
-        fi
-done
-
-
 AC_OUTPUT(\
 	./makefile \
 	./lib/Makefile \