Summary: BUGFIX: ufs auto-add logic was broken.

Keywords:

* src/Makefile.am referenced unused variable STORE_SOURCES.
* configure.in incorrectly set STORE_LINKOBJS when ufs was not selected.

This also fixes bug #746.

diff --git a/configure.in b/configure.in
index c48758cf339e031316323bffce9c9db2931f9d0b..89a535ec5e02b70ab7b3796db3eb2075c357756f 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.343 2003/08/05 21:40:00 robertc Exp $
+dnl  $Id: configure.in,v 1.344 2003/08/14 14:36:59 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-PRE2-CVS)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.343 $)dnl
+AC_REVISION($Revision: 1.344 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -468,7 +468,7 @@ if test -z "$UFS_FOUND" && test -n "$NEED_UFS"; then
    STORE_OBJS="$STORE_OBJS fs/libufs.a"
    STORE_LIBS="$STORE_LIBS libufs.a"
    STORE_MODULES="$STORE_MODULES ufs"
-   STORE_LINKOBJS="$STORE_SOURCE fs/ufs/StoreFSufs.o"
+   STORE_LINKOBJS="$STORE_LINKOBJS fs/ufs/StoreFSufs.o"
 fi
   
 AC_SUBST(STORE_OBJS)

diff --git a/src/Makefile.am b/src/Makefile.am
index d760b0b50b0b5e2b82913bed10d701bab3689edf..9c4833f7857715cad8949c3f3e9f4a6631c0ea62 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.87 2003/08/03 21:38:15 robertc Exp $
+#  $Id: Makefile.am,v 1.88 2003/08/14 14:37:00 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -445,7 +445,6 @@ squid_SOURCES = \
        StoreMetaURL.h \
        StoreMetaVary.cc \
        StoreMetaVary.h \
-       $(STORE_SOURCES) \
        StoreSwapLogData.cc \
        StoreSwapLogData.h \
        structs.h \