From 8eb03ea47867643fe2ef23260de10b42b6725245 Mon Sep 17 00:00:00 2001 From: Henrik Nordstrom Date: Fri, 9 May 2008 18:13:24 -0600 Subject: [PATCH] Bootstrapped --- configure | 61 ++++++++++++++++--------------------------- include/autoconf.h.in | 5 ---- 2 files changed, 23 insertions(+), 43 deletions(-) diff --git a/configure b/configure index 6cc208f6e3..ad9af58c76 100755 --- a/configure +++ b/configure @@ -1765,7 +1765,6 @@ Optional Features: variance within an accelerator setup. Typically used together with other code that adds custom HTTP headers to the requests. - --enable-zph-qos Enable ZPH QOS support Optional Packages: --with-PACKAGE[=ARG] use PACKAGE [ARG=yes] @@ -5341,7 +5340,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 5344 "configure"' > conftest.$ac_ext + echo '#line 5343 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -7611,11 +7610,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:7614: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7613: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7618: \$? = $ac_status" >&5 + echo "$as_me:7617: \$? = $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. @@ -7901,11 +7900,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:7904: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7903: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7908: \$? = $ac_status" >&5 + echo "$as_me:7907: \$? = $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. @@ -8005,11 +8004,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:8008: $lt_compile\"" >&5) + (eval echo "\"\$as_me:8007: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:8012: \$? = $ac_status" >&5 + echo "$as_me:8011: \$? = $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 @@ -10354,7 +10353,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:12876: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:12881: \$? = $ac_status" >&5 + echo "$as_me:12880: \$? = $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. @@ -12978,11 +12977,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:12981: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12980: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12985: \$? = $ac_status" >&5 + echo "$as_me:12984: \$? = $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 @@ -14540,11 +14539,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:14543: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14542: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:14547: \$? = $ac_status" >&5 + echo "$as_me:14546: \$? = $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. @@ -14644,11 +14643,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:14647: $lt_compile\"" >&5) + (eval echo "\"\$as_me:14646: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:14651: \$? = $ac_status" >&5 + echo "$as_me:14650: \$? = $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 @@ -16831,11 +16830,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:16834: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16833: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16838: \$? = $ac_status" >&5 + echo "$as_me:16837: \$? = $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. @@ -17121,11 +17120,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:17124: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17123: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:17128: \$? = $ac_status" >&5 + echo "$as_me:17127: \$? = $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. @@ -17225,11 +17224,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:17228: $lt_compile\"" >&5) + (eval echo "\"\$as_me:17227: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:17232: \$? = $ac_status" >&5 + echo "$as_me:17231: \$? = $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 @@ -22923,20 +22922,6 @@ _ACEOF fi -# Check whether --enable-zph-qos was given. -if test "${enable_zph_qos+set}" = set; then - enableval=$enable_zph_qos; if test "$enableval" = "yes" ; then - echo "ZPH QOS enabled" - -cat >>confdefs.h <<\_ACEOF -#define USE_ZPH_QOS 1 -_ACEOF - - fi - -fi - - # Check whether --with-filedescriptors was given. if test "${with_filedescriptors+set}" = set; then diff --git a/include/autoconf.h.in b/include/autoconf.h.in index 27f91653cf..a05888640f 100644 --- a/include/autoconf.h.in +++ b/include/autoconf.h.in @@ -988,11 +988,6 @@ /* Define to enable CPU profiling within Squid */ #undef USE_XPROF_STATS -/* Define this to use Squid's ZPH (Zero Penalty Hit) QOS features. When - enabled, Squid will alter TOS field of HIT responses for better QOS on - intermediate routing/shaping devices. */ -#undef USE_ZPH_QOS - /* Version number of package */ #undef VERSION -- 2.47.2