support --removal-policies again, and add Store.h to the listed source files

diff --git a/configure b/configure
index 6f178d6e0a506aa668bd7454ec31947da095ebae..c8d682d359f0467858d572bda4388563ed79823e 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.296 .
+# From configure.in Revision: 1.297 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -4232,9 +4232,10 @@ if test "${enable_removal_policies+set}" = set; then
    case $enableval in
   yes)
        for module in $srcdir/src/repl/*; do
-           if test -f $module/Makefile.in; then
+           if test -d $module; then
                REPL_POLICIES="$REPL_POLICIES `basename $module`"
            fi
+           REPL_POLICIES="`echo $REPL_POLICIES|sed -e 's/CVS//g'`"
        done
        ;;
   no)

diff --git a/configure.in b/configure.in
index 44fe20ebeaa91ec3cc5cc30d1e6df1635c7dbd87..19dda0e3cfcd38bb2c51d8f3e513519bd6b5eae5 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -3,7 +3,7 @@ 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.297 2002/10/19 01:00:26 robertc Exp $
+dnl  $Id: configure.in,v 1.298 2002/10/19 01:23:22 robertc Exp $
 dnl
 dnl
 dnl
@@ -13,7 +13,7 @@ AC_CONFIG_SRCDIR([src/main.cc])
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(squid, 3.0-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.297 $)dnl
+AC_REVISION($Revision: 1.298 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -419,9 +419,10 @@ AC_ARG_ENABLE(removal-policies,
 [ case $enableval in
   yes)
        for module in $srcdir/src/repl/*; do
-           if test -f $module/Makefile.in; then
+           if test -d $module; then
                REPL_POLICIES="$REPL_POLICIES `basename $module`"
            fi
+           REPL_POLICIES="`echo $REPL_POLICIES|sed -e 's/CVS//g'`"
        done
        ;;
   no)

diff --git a/src/Makefile.am b/src/Makefile.am
index a265ef2a7e66b436d1bab9afb005f57faa01f900..3ace7c105e5ad1cdd42fdb045948590c0f2295b9 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.am,v 1.38 2002/10/14 08:29:45 robertc Exp $
+#  $Id: Makefile.am,v 1.39 2002/10/19 01:23:22 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -205,6 +205,7 @@ squid_SOURCES = \
        String.cc \
        stmem.cc \
        store.cc \
+       Store.h \
        store_io.cc \
        StoreIOBuffer.h \
        store_client.cc \

diff --git a/src/Makefile.in b/src/Makefile.in
index df02a9a3e4c3d44360243049eadd6fa4332fb2cb..65862f27c723ff07013e64fc6815af56f1527956 100644 (file)
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.255 2002/10/15 08:11:39 robertc Exp $
+#  $Id: Makefile.in,v 1.256 2002/10/19 01:23:22 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -296,6 +296,7 @@ squid_SOURCES = \
        String.cc \
        stmem.cc \
        store.cc \
+       Store.h \
        store_io.cc \
        StoreIOBuffer.h \
        store_client.cc \