bootstrap

diff --git a/configure b/configure
index 0a5e28160379a5b8170c772e28a9eb7b71989c42..871a7e41f5accf7fb359063c80315cbf64375df2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.307 .
+# From configure.in Revision: 1.308 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.53.
 #
@@ -1656,7 +1656,7 @@ fi
 
 # Define the identity of the package.
 PACKAGE=squid
-VERSION=3.0-DEVEL
+VERSION=3.0-DEVEL-unifyio
 
 cat >>confdefs.h <<_ACEOF
 #define PACKAGE "$PACKAGE"
@@ -4180,6 +4180,7 @@ STORE_OBJS="fs/lib`echo $STORE_MODULES|sed -e 's% %.a fs/lib%g'`.a"
 STORE_LIBS="`echo $STORE_OBJS|sed -e 's%fs/%%g'`"
 
 STORE_MODULE_SUBDIRS=
+UFS_FOUND=
 for fs in $STORE_MODULES none; do
     case "$fs" in
     diskd)
@@ -4197,9 +4198,21 @@ for fs in $STORE_MODULES none; do
            with_aio=yes
        fi
        ;;
+    ufs)
+        UFS_FOUND="true"
     esac
 done
 
+if test -z "$UFS_FOUND"; then
+   echo "adding UFS, as it contains core logic for diskd and aufs"
+   STORE_OBJS="$STORE_OBJS fs/libufs.a"
+
+   STORE_LIBS="$STORE_LIBS libufs.a"
+
+   STORE_MODULES="$STORE_MODULES ufs"
+fi
+
+
 
 
 # Check whether --enable-heap-replacement or --disable-heap-replacement was given.

diff --git a/src/Makefile.in b/src/Makefile.in
index 82dcc20f3eb197ff4b55a34c32b742b82f2f544e..be59fb946e96d1e8dde3a59ce9093bfc78056198 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.264 2002/12/15 09:04:57 robertc Exp $
+#  $Id: Makefile.in,v 1.265 2002/12/27 10:30:14 robertc Exp $
 #
 #  Uncomment and customize the following to suit your needs:
 #
@@ -305,6 +305,8 @@ squid_SOURCES = \
        Store.h \
        store_io.cc \
        StoreIOBuffer.h \
+       StoreIOState.cc \
+       StoreIOState.h \
        store_client.cc \
        StoreClient.h \
        store_digest.cc \
@@ -316,6 +318,8 @@ squid_SOURCES = \
        store_swapmeta.cc \
        store_swapout.cc \
        structs.h \
+       SwapDir.cc \
+       SwapDir.h \
        tools.cc \
        typedefs.h \
        ufscommon.cc \
@@ -353,7 +357,7 @@ squid_LDADD = \
        -lmiscutil \
        @XTRA_LIBS@
 
-squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a
+squid_DEPENDENCIES = $(top_builddir)/lib/libmiscutil.a @STORE_OBJS@
 
 unlinkd_SOURCES = unlinkd.cc
 unlinkd_CXXFLAGS = -DUNLINK_DAEMON
@@ -542,14 +546,15 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) asn.$(OBJEXT) \
        refresh.$(OBJEXT) send-announce.$(OBJEXT) $(am__objects_8) \
        ssl.$(OBJEXT) $(am__objects_9) stat.$(OBJEXT) \
        StatHist.$(OBJEXT) String.$(OBJEXT) stmem.$(OBJEXT) \
-       store.$(OBJEXT) store_io.$(OBJEXT) store_client.$(OBJEXT) \
-       store_digest.$(OBJEXT) store_dir.$(OBJEXT) \
-       store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \
+       store.$(OBJEXT) store_io.$(OBJEXT) StoreIOState.$(OBJEXT) \
+       store_client.$(OBJEXT) store_digest.$(OBJEXT) \
+       store_dir.$(OBJEXT) store_key_md5.$(OBJEXT) store_log.$(OBJEXT) \
        store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \
        store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \
-       tools.$(OBJEXT) ufscommon.$(OBJEXT) $(am__objects_10) \
-       url.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) \
-       wccp.$(OBJEXT) whois.$(OBJEXT) $(am__objects_11)
+       SwapDir.$(OBJEXT) tools.$(OBJEXT) ufscommon.$(OBJEXT) \
+       $(am__objects_10) url.$(OBJEXT) urn.$(OBJEXT) \
+       useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \
+       whois.$(OBJEXT) $(am__objects_11)
 nodist_squid_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \
        store_modules.$(OBJEXT) globals.$(OBJEXT) \
        string_arrays.$(OBJEXT)
@@ -579,7 +584,8 @@ depcomp = $(SHELL) $(top_srcdir)/cfgaux/depcomp
 @AMDEP_TRUE@   $(DEPDIR)/HttpStatusLine.Po \
 @AMDEP_TRUE@   $(DEPDIR)/IPInterception.Po $(DEPDIR)/MemBuf.Po \
 @AMDEP_TRUE@   $(DEPDIR)/Packer.Po $(DEPDIR)/ProfStats.Po \
-@AMDEP_TRUE@   $(DEPDIR)/StatHist.Po $(DEPDIR)/String.Po \
+@AMDEP_TRUE@   $(DEPDIR)/StatHist.Po $(DEPDIR)/StoreIOState.Po \
+@AMDEP_TRUE@   $(DEPDIR)/String.Po $(DEPDIR)/SwapDir.Po \
 @AMDEP_TRUE@   $(DEPDIR)/access_log.Po $(DEPDIR)/acl.Po \
 @AMDEP_TRUE@   $(DEPDIR)/asn.Po $(DEPDIR)/auth_modules.Po \
 @AMDEP_TRUE@   $(DEPDIR)/authenticate.Po $(DEPDIR)/cache_cf.Po \
@@ -790,7 +796,9 @@ distclean-compile:
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/Packer.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/ProfStats.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/StatHist.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/StoreIOState.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/String.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/SwapDir.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/access_log.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/acl.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@$(DEPDIR)/asn.Po@am__quote@

diff --git a/test-suite/Makefile.in b/test-suite/Makefile.in
index f8da57c3237f7429b29ceeb49d5d3007fc5d2b53..12a7e381376278c659096b2c30bf47e51931cf20 100644 (file)
--- a/test-suite/Makefile.in
+++ b/test-suite/Makefile.in
@@ -16,7 +16,7 @@
 #
 #  Makefile for the Squid Object Cache server
 #
-#  $Id: Makefile.in,v 1.2 2002/11/22 14:25:38 robertc Exp $
+#  $Id: Makefile.in,v 1.3 2002/12/27 10:30:15 robertc Exp $
 #
 
 SHELL = @SHELL@
@@ -119,6 +119,8 @@ am__quote = @am__quote@
 install_sh = @install_sh@
 makesnmplib = @makesnmplib@
 
+AUTOMAKE_OPTIONS = subdir-objects
+
 AM_CFLAGS = -Werror -Wall
 AM_CXXFLAGS = -Werror -Wall
 
@@ -219,13 +221,13 @@ distclean-depend:
 @AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(COMPILE) -c `test -f $< || echo '$(srcdir)/'`$<
+       $(COMPILE) -c -o $@ `test -f $< || echo '$(srcdir)/'`$<
 
 .c.obj:
 @AMDEP_TRUE@   source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
 @AMDEP_TRUE@   depfile='$(DEPDIR)/$*.Po' tmpdepfile='$(DEPDIR)/$*.TPo' @AMDEPBACKSLASH@
 @AMDEP_TRUE@   $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
-       $(COMPILE) -c `cygpath -w $<`
+       $(COMPILE) -c -o $@ `cygpath -w $<`
 CCDEPMODE = @CCDEPMODE@
 
 .cc.o: