Fix: missing repl/lru/store_repl_lru.o

diff --git a/configure.in b/configure.in
index 7f4a529095fcd9b15f52aaeca34673a604f8daa9..602b26430bba399351dd36a603ed9e57d118ebcc 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -670,6 +670,11 @@ AC_SUBST(DISK_LINKOBJS)
 AM_CONDITIONAL([USE_AIOPS_WIN32], [test "$USE_AIOPS_WIN32" = 1])
 AM_CONDITIONAL([USE_AIO_WIN32], [test "$USE_AIO_WIN32" = 1])
 
+
+dnl At lest one removal policy is always needed.
+dnl 'lru' removal policy is currently hard-coded by name for tests
+dnl so we must set it as default.
+REPL_POLICIES="lru"
 AC_ARG_ENABLE(removal-policies,
   AC_HELP_STRING([--enable-removal-policies="list of policies"],
                  [Build support for the list of removal policies.
@@ -681,7 +686,7 @@ AC_ARG_ENABLE(removal-policies,
   yes)
        for dir in $srcdir/src/repl/*; do
            module="`basename $dir`"
-           if test -d "$dir" && test "$module" != CVS; then
+           if test -d "$dir" && test "$module" != CVS && test "$module" != "lru"; then
                REPL_POLICIES="$REPL_POLICIES $module"
            fi
        done
@@ -692,10 +697,6 @@ AC_ARG_ENABLE(removal-policies,
        REPL_POLICIES="`echo $enableval| sed -e 's/,/ /g;s/  */ /g'`"
        ;;
   esac
-],
-[ if test -z "$REPL_POLICIES"; then
-    REPL_POLICIES="lru"
-  fi
 ])
 if test -n "$REPL_POLICIES"; then
     for module in $REPL_POLICIES; do

diff --git a/src/Makefile.am b/src/Makefile.am
index 692f265d0e5cf41e10c0020f875e8aadf039e613..b55d4daf0b14ac62ba8978c35cb95af74ad559a0 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -2234,7 +2234,6 @@ SWAP_TEST_SOURCES = \
 
 SWAP_TEST_LDADD = \
        libauth.la \
-       repl/lru/store_repl_lru.o \
        @REGEXLIB@ \
        @STORE_LINKOBJS@ \
        @STORE_OBJS@ \
@@ -2244,7 +2243,6 @@ SWAP_TEST_LDADD = \
        @SQUID_CPPUNIT_LIBS@
 SWAP_TEST_DS =\
        $(top_builddir)/lib/libmiscutil.a \
-       repl/lru/store_repl_lru.o \
        repl_modules.o \
        @DISK_LIBS@ \
        @STORE_LINKOBJS@ \