--------------------- PatchSet 1602 Date: 2001/02/18 05:13:47 Author: rbcollins Branch: rbcollins_filters Tag: (none) Log: tidy up in preparation for move to content_processing branch Members: configure.in:1.1.1.3.8.11.2.3->1.1.1.3.8.11.2.4 Index: squid/configure.in =================================================================== RCS file: /cvsroot/squid-sf//squid/configure.in,v retrieving revision 1.1.1.3.8.11.2.3 retrieving revision 1.1.1.3.8.11.2.4 diff -u -r1.1.1.3.8.11.2.3 -r1.1.1.3.8.11.2.4 --- squid/configure.in 5 Feb 2001 13:37:02 -0000 1.1.1.3.8.11.2.3 +++ squid/configure.in 18 Feb 2001 05:13:47 -0000 1.1.1.3.8.11.2.4 @@ -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.3 2001/02/05 13:37:02 rbcollins Exp $ +dnl $Id: configure.in,v 1.1.1.3.8.11.2.4 2001/02/18 05:13:47 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.3 $)dnl +AC_REVISION($Revision: 1.1.1.3.8.11.2.4 $)dnl AC_PREFIX_DEFAULT(/usr/local/squid) AC_CONFIG_AUX_DIR(cfgaux) @@ -824,7 +824,7 @@ fi AC_SUBST(DIGEST_AUTH_HELPERS) -dnl Select generic modules to build +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. @@ -847,12 +847,12 @@ ]) 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 -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) dnl Disable "unlinkd" code AC_ARG_ENABLE(unlinkd,