From: serassio <> Date: Sun, 2 Jul 2006 22:55:09 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE5~233 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=fbbe3d253abfb225617bef3ecb7a79eb0a51d102;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/configure b/configure index bb618acaa7..17871169f3 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.424 . +# From configure.in Revision. # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for Squid Web Proxy 3.0.PRE4-CVS. # @@ -1103,6 +1103,7 @@ Optional Features: --enable-useragent-log Enable logging of User-Agent header --enable-referer-log Enable logging of Referer header --disable-wccp Disable Web Cache Coordination Protocol + --disable-wccpv2 Disable Web Cache Coordination V2 Protocol --enable-kill-parent-hack Kill parent on shutdown --enable-snmp Enable SNMP monitoring @@ -4587,7 +4588,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4590 "configure"' > conftest.$ac_ext + echo '#line 4591 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5722,7 +5723,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5725:" \ +echo "$as_me:5726:" \ "checking for Fortran 77 compiler version" >&5 ac_compiler=`set X $ac_compile; echo $2` { (eval echo "$as_me:$LINENO: \"$ac_compiler --version &5\"") >&5 @@ -6785,11 +6786,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:6788: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6789: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6792: \$? = $ac_status" >&5 + echo "$as_me:6793: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7053,11 +7054,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7056: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7057: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7060: \$? = $ac_status" >&5 + echo "$as_me:7061: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -7157,11 +7158,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:7160: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7161: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7164: \$? = $ac_status" >&5 + echo "$as_me:7165: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -9502,7 +9503,7 @@ else lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext < conftest.$ac_ext <&5) + (eval echo "\"\$as_me:11946: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11949: \$? = $ac_status" >&5 + echo "$as_me:11950: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -12046,11 +12047,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:12049: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12050: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12053: \$? = $ac_status" >&5 + echo "$as_me:12054: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -13616,11 +13617,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13619: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13620: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13623: \$? = $ac_status" >&5 + echo "$as_me:13624: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -13720,11 +13721,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:13723: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13724: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13727: \$? = $ac_status" >&5 + echo "$as_me:13728: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -15923,11 +15924,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:15926: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15927: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15930: \$? = $ac_status" >&5 + echo "$as_me:15931: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16191,11 +16192,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16194: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16195: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16198: \$? = $ac_status" >&5 + echo "$as_me:16199: \$? = $ac_status" >&5 if (exit $ac_status) && test -s "$ac_outfile"; then # The compiler can only warn and ignore the option if not recognized # So say no if there are warnings other than the usual output. @@ -16295,11 +16296,11 @@ else -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \ -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \ -e 's:$: $lt_compiler_flag:'` - (eval echo "\"\$as_me:16298: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16299: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16302: \$? = $ac_status" >&5 + echo "$as_me:16303: \$? = $ac_status" >&5 if (exit $ac_status) && test -s out/conftest2.$ac_objext then # The compiler can only warn and ignore the option if not recognized @@ -20677,25 +20678,38 @@ _ACEOF fi; -use_wccp=1 +USE_WCCP=1 # Check whether --enable-wccp or --disable-wccp was given. if test "${enable_wccp+set}" = set; then enableval="$enable_wccp" if test "$enableval" = "no" ; then echo "Web Cache Coordination Protocol disabled" - use_wccp=0 + USE_WCCP=0 fi fi; -if test $use_wccp = 1; then +if test $USE_WCCP = 1; then cat >>confdefs.h <<\_ACEOF #define USE_WCCP 1 _ACEOF -else - cat >>confdefs.h <<\_ACEOF -#define USE_WCCP 0 +fi + +USE_WCCPv2=1 +# Check whether --enable-wccpv2 or --disable-wccpv2 was given. +if test "${enable_wccpv2+set}" = set; then + enableval="$enable_wccpv2" + if test "$enableval" = "no" ; then + echo "Web Cache Coordination V2 Protocol disabled" + USE_WCCPv2=0 + fi + +fi; +if test $USE_WCCPv2 = 1; then + +cat >>confdefs.h <<\_ACEOF +#define USE_WCCPv2 1 _ACEOF fi diff --git a/include/autoconf.h.in b/include/autoconf.h.in index c7a5c46a5f..a4c77fa90e 100644 --- a/include/autoconf.h.in +++ b/include/autoconf.h.in @@ -919,6 +919,9 @@ /* Define to enable WCCP */ #undef USE_WCCP +/* Define to enable WCCP V2 */ +#undef USE_WCCPv2 + /* Define Windows NT & Windows 2000 run service mode */ #undef USE_WIN32_SERVICE diff --git a/src/Makefile.in b/src/Makefile.in index 6c3c0378a3..d4d4eb9241 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.394 2006/06/14 19:19:23 serassio Exp $ +# $Id: Makefile.in,v 1.395 2006/07/02 16:55:10 serassio Exp $ # # Uncomment and customize the following to suit your needs: # @@ -242,8 +242,8 @@ am__squid_SOURCES_DIST = access_log.cc AccessLogEntry.h acl.cc \ StoreSwapLogData.cc StoreSwapLogData.h Server.cc Server.h \ structs.h SwapDir.cc SwapDir.h time.cc tools.cc typedefs.h \ unlinkd.cc url.cc URL.h URLScheme.cc URLScheme.h urn.cc \ - useragent.cc wais.cc wccp.cc whois.cc wordlist.cc wordlist.h \ - win32.cc + useragent.cc wais.cc wccp.cc wccp2.cc whois.cc wordlist.cc \ + wordlist.h win32.cc am__objects_1 = ACLARP.$(OBJEXT) @ENABLE_ARP_ACL_TRUE@am__objects_2 = $(am__objects_1) am__objects_3 = $(am__objects_2) ACLASN.$(OBJEXT) ACLBrowser.$(OBJEXT) \ @@ -340,7 +340,7 @@ am_squid_OBJECTS = access_log.$(OBJEXT) acl.$(OBJEXT) \ Server.$(OBJEXT) SwapDir.$(OBJEXT) time.$(OBJEXT) \ tools.$(OBJEXT) $(am__objects_20) url.$(OBJEXT) \ URLScheme.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) \ - wais.$(OBJEXT) wccp.$(OBJEXT) whois.$(OBJEXT) \ + wais.$(OBJEXT) wccp.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \ wordlist.$(OBJEXT) $(am__objects_22) nodist_squid_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \ string_arrays.$(OBJEXT) @@ -1032,7 +1032,8 @@ am__ufsdump_SOURCES_DIST = debug.cc int.cc mem.cc store_key_md5.cc \ store_dir.cc store_log.cc store_rebuild.cc store_swapin.cc \ store_swapmeta.cc store_swapout.cc structs.h SwapDir.cc \ tools.cc typedefs.h unlinkd.cc URLScheme.cc urn.cc \ - useragent.cc wais.cc wccp.cc whois.cc wordlist.cc win32.cc + useragent.cc wais.cc wccp.cc wccp2.cc whois.cc wordlist.cc \ + win32.cc am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) mem.$(OBJEXT) \ store_key_md5.$(OBJEXT) StoreMeta.$(OBJEXT) \ StoreMetaMD5.$(OBJEXT) StoreMetaSTD.$(OBJEXT) \ @@ -1080,7 +1081,7 @@ am_ufsdump_OBJECTS = debug.$(OBJEXT) int.$(OBJEXT) mem.$(OBJEXT) \ store_swapmeta.$(OBJEXT) store_swapout.$(OBJEXT) \ SwapDir.$(OBJEXT) tools.$(OBJEXT) $(am__objects_20) \ URLScheme.$(OBJEXT) urn.$(OBJEXT) useragent.$(OBJEXT) \ - wais.$(OBJEXT) wccp.$(OBJEXT) whois.$(OBJEXT) \ + wais.$(OBJEXT) wccp.$(OBJEXT) wccp2.$(OBJEXT) whois.$(OBJEXT) \ wordlist.$(OBJEXT) $(am__objects_22) nodist_ufsdump_OBJECTS = repl_modules.$(OBJEXT) globals.$(OBJEXT) \ string_arrays.$(OBJEXT) @@ -1840,6 +1841,7 @@ squid_SOURCES = \ useragent.cc \ wais.cc \ wccp.cc \ + wccp2.cc \ whois.cc \ wordlist.cc \ wordlist.h \ @@ -2080,6 +2082,7 @@ ufsdump_SOURCES = \ useragent.cc \ wais.cc \ wccp.cc \ + wccp2.cc \ whois.cc \ wordlist.cc \ $(WIN32_SOURCE) @@ -3934,6 +3937,7 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/useragent.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wais.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wccp.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wccp2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/whois.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/win32.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/wordlist.Po@am__quote@