From: robertc <> Date: Fri, 15 Aug 2003 03:12:03 +0000 (+0000) Subject: bootstrapped X-Git-Tag: SQUID_3_0_PRE3~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bd02a6c6790da6726751e5a7d62355c174192312;p=thirdparty%2Fsquid.git bootstrapped --- diff --git a/configure b/configure index bbee1aa2f7..19588b281b 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.343 . +# From configure.in Revision: 1.344 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.57. # @@ -4731,7 +4731,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 diff --git a/src/Makefile.in b/src/Makefile.in index 19bd51293c..ef510f44af 100644 --- a/src/Makefile.in +++ b/src/Makefile.in @@ -17,7 +17,7 @@ # # Makefile for the Squid Object Cache server # -# $Id: Makefile.in,v 1.317 2003/08/03 21:38:15 robertc Exp $ +# $Id: Makefile.in,v 1.318 2003/08/14 21:12:05 robertc Exp $ # # Uncomment and customize the following to suit your needs: # @@ -617,7 +617,6 @@ squid_SOURCES = \ StoreMetaURL.h \ StoreMetaVary.cc \ StoreMetaVary.h \ - $(STORE_SOURCES) \ StoreSwapLogData.cc \ StoreSwapLogData.h \ structs.h \ @@ -1106,10 +1105,10 @@ am__objects_17 = ACLCertificateData.$(OBJEXT) ACLCertificate.$(OBJEXT) \ ssl_support.$(OBJEXT) @ENABLE_SSL_TRUE@am__objects_18 = $(am__objects_17) @ENABLE_SSL_FALSE@am__objects_18 = -@ENABLE_UNLINKD_TRUE@am__objects_20 = unlinkd.$(OBJEXT) -@ENABLE_UNLINKD_FALSE@am__objects_20 = -@ENABLE_WIN32SPECIFIC_TRUE@am__objects_21 = win32.$(OBJEXT) -@ENABLE_WIN32SPECIFIC_FALSE@am__objects_21 = +@ENABLE_UNLINKD_TRUE@am__objects_19 = unlinkd.$(OBJEXT) +@ENABLE_UNLINKD_FALSE@am__objects_19 = +@ENABLE_WIN32SPECIFIC_TRUE@am__objects_20 = win32.$(OBJEXT) +@ENABLE_WIN32SPECIFIC_FALSE@am__objects_20 = am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ ACLChecklist.$(OBJEXT) $(am__objects_3) asn.$(OBJEXT) \ authenticate.$(OBJEXT) cache_cf.$(OBJEXT) CacheDigest.$(OBJEXT) \ @@ -1151,10 +1150,10 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ StoreMeta.$(OBJEXT) StoreMetaMD5.$(OBJEXT) \ StoreMetaSTD.$(OBJEXT) StoreMetaUnpacker.$(OBJEXT) \ StoreMetaURL.$(OBJEXT) StoreMetaVary.$(OBJEXT) \ - $(am__objects_19) StoreSwapLogData.$(OBJEXT) SwapDir.$(OBJEXT) \ - tools.$(OBJEXT) ufscommon.$(OBJEXT) $(am__objects_20) \ - url.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) \ - wccp.$(OBJEXT) whois.$(OBJEXT) $(am__objects_21) + StoreSwapLogData.$(OBJEXT) SwapDir.$(OBJEXT) tools.$(OBJEXT) \ + ufscommon.$(OBJEXT) $(am__objects_19) url.$(OBJEXT) \ + urn.$(OBJEXT) useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \ + whois.$(OBJEXT) $(am__objects_20) am__dirstamp = $(am__leading_dot)dirstamp nodist_squid_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \ globals.$(OBJEXT) string_arrays.$(OBJEXT) @@ -1273,9 +1272,9 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) ufsdump.$(OBJEXT) \ store_rebuild.$(OBJEXT) store_swapin.$(OBJEXT) \ store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \ SwapDir.$(OBJEXT) tools.$(OBJEXT) ufscommon.$(OBJEXT) \ - $(am__objects_20) url.$(OBJEXT) urn.$(OBJEXT) \ + $(am__objects_19) url.$(OBJEXT) urn.$(OBJEXT) \ useragent.$(OBJEXT) wais.$(OBJEXT) wccp.$(OBJEXT) \ - whois.$(OBJEXT) $(am__objects_21) + whois.$(OBJEXT) $(am__objects_20) nodist_ufsdump_OBJECTS = repl_modules.$(OBJEXT) auth_modules.$(OBJEXT) \ globals.$(OBJEXT) string_arrays.$(OBJEXT) ufsdump_OBJECTS = $(am_ufsdump_OBJECTS) $(nodist_ufsdump_OBJECTS)