---------------------
PatchSet 1424 
Date: 2001/01/30 04:57:21
Author: rbcollins
Branch: rbcollins_filters
Tag: (none) 
Log:
module configure option added

Members: 
	configure.in:1.1.1.3.8.11->1.1.1.3.8.11.2.1 
	doc/debug-sections.txt:1.1.1.2.8.2.4.1->1.1.1.2.8.2.4.2 
	src/cache_cf.c:1.1.1.3.4.1.4.7.4.3->1.1.1.3.4.1.4.7.4.4 

Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.1.1.3.8.11
retrieving revision 1.1.1.3.8.11.2.1
diff -u -r1.1.1.3.8.11 -r1.1.1.3.8.11.2.1
--- squid/configure.in	11 Jan 2001 12:09:57 -0000	1.1.1.3.8.11
+++ squid/configure.in	30 Jan 2001 04:57:21 -0000	1.1.1.3.8.11.2.1
@@ -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 2001/01/11 12:09:57 rbcollins Exp $
+dnl  $Id: configure.in,v 1.1.1.3.8.11.2.1 2001/01/30 04:57:21 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 $)dnl
+AC_REVISION($Revision: 1.1.1.3.8.11.2.1 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AC_CONFIG_AUX_DIR(cfgaux)
 
@@ -799,6 +799,36 @@
 AC_SUBST(NTLM_AUTH_HELPERS)
 
 
+dnl Select generic modules to build
+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"
+fi
+AC_SUBST(CONF_MODULES)
+CONF_MODULE_OBJS="modules/`echo $CONF_MODULES|sed -e's% %.a modules/%g'`.a"
+AC_SUBST(CONF_MODULE_OBJS)
+COMF_MODULE_LIBS="`echo $CONF_MODULE_OBJS|sed -e's%module/%%g'`"
+AC_SUBST(CONF_MODULE_LIBS)
+
 dnl Disable "unlinkd" code
 AC_ARG_ENABLE(unlinkd,
 [  --disable-unlinkd       Do not use unlinkd],
Index: squid/doc/debug-sections.txt
===================================================================
RCS file: /cvsroot/squid-sf//squid/doc/debug-sections.txt,v
retrieving revision 1.1.1.2.8.2.4.1
retrieving revision 1.1.1.2.8.2.4.2
diff -u -r1.1.1.2.8.2.4.1 -r1.1.1.2.8.2.4.2
--- squid/doc/debug-sections.txt	16 Jan 2001 15:31:59 -0000	1.1.1.2.8.2.4.1
+++ squid/doc/debug-sections.txt	30 Jan 2001 04:57:22 -0000	1.1.1.2.8.2.4.2
@@ -87,3 +87,5 @@
 section 80    WCCP
 section 81    Store Removal/Replacement policy
 section 82    Transfer-encoding Routines
+section 83    Data processing Filters
+section 84    Generic Module Routines
Index: squid/src/cache_cf.c
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/cache_cf.c,v
retrieving revision 1.1.1.3.4.1.4.7.4.3
retrieving revision 1.1.1.3.4.1.4.7.4.4
diff -u -r1.1.1.3.4.1.4.7.4.3 -r1.1.1.3.4.1.4.7.4.4
--- squid/src/cache_cf.c	30 Jan 2001 04:28:30 -0000	1.1.1.3.4.1.4.7.4.3
+++ squid/src/cache_cf.c	30 Jan 2001 04:57:22 -0000	1.1.1.3.4.1.4.7.4.4
@@ -1,6 +1,6 @@
 
 /*
- * $Id: cache_cf.c,v 1.1.1.3.4.1.4.7.4.3 2001/01/30 04:28:30 rbcollins Exp $
+ * $Id: cache_cf.c,v 1.1.1.3.4.1.4.7.4.4 2001/01/30 04:57:22 rbcollins Exp $
  *
  * DEBUG: section 3     Configuration File Parsing
  * AUTHOR: Harvest Derived
@@ -1015,7 +1015,7 @@
     char *instance_str;
     filterAccess   *filter = NULL;
     FILTER_instance *instance = NULL;
-    int type, i;
+    int i;
 
     if ((instance_str = strtok(NULL, w_space)) == NULL)
         self_destruct();
@@ -1094,7 +1094,7 @@
     char *name_str, *instance_str;
     FILTER_module   *module = NULL;
     FILTER_instance *instance = NULL;
-    int type, i;
+    int i;
 
     if ((name_str = strtok(NULL, w_space)) == NULL)
         self_destruct();
@@ -1148,9 +1148,7 @@
 {
 
     char *param_str, *instance_str;
-    FILTER_module   *module = NULL;
     FILTER_instance *instance = NULL;
-    int type, i;
 
     if ((instance_str = strtok(NULL, w_space)) == NULL)
         self_destruct();