From: robertc <>
Date: Sat, 19 Oct 2002 07:23:21 +0000 (+0000)
Subject: support --removal-policies again, and add Store.h to the listed source files
X-Git-Tag: SQUID_3_0_PRE1~621
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d785ef8f648e9451497c299b3fc875c713a0cef9;p=thirdparty%2Fsquid.git

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

diff --git a/configure b/configure
index 6f178d6e0a..c8d682d359 100755
--- 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 44fe20ebea..19dda0e3cf 100644
--- 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 a265ef2a7e..3ace7c105e 100644
--- 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 df02a9a3e4..65862f27c7 100644
--- 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 \