From: hno <> Date: Tue, 28 Aug 2007 04:28:27 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE7~15 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dfdb357c3d7b6cc39def4b332aeada572e12e1ed;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/configure b/configure index e3f5a65888..caa53748c9 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.468 . +# From configure.in Revision: 1.471 . # Guess values for system-dependent variables and create Makefiles. # Generated by GNU Autoconf 2.59 for Squid Web Proxy 3.0.PRE6-CVS. # @@ -1104,11 +1104,11 @@ Optional Features: --disable-wccpv2 Disable Web Cache Coordination V2 Protocol --enable-kill-parent-hack Kill parent on shutdown - --enable-snmp Enable SNMP monitoring + --disable-snmp Disable SNMP monitoring support --enable-cachemgr-hostname=hostname Make cachemgr.cgi default to this host --enable-arp-acl Enable use of ARP ACL lists (ether address) - --enable-htcp Enable HTCP protocol + --disable-htcp Disable HTCP protocol support --enable-ssl Enable ssl gatewaying support using OpenSSL --enable-forw-via-db Enable Forw/Via database --enable-cache-digests Use Cache Digests @@ -1119,14 +1119,10 @@ Optional Features: --enable-err-languages=\"lang1 lang2..\" Select languages to be installed. (All will be installed by default) - --enable-poll Enable poll() support. --disable-poll Disable poll() support. - --enable-select Enable select() support. --disable-select Disable select() support. --enable-kqueue Enable kqueue() support (experimental). - --disable-kqueue Disable kqueue() support. - --enable-epoll Enable epoll() support. - --disable-epoll Disable epoll() support. + --disable-epoll Disable Linux epoll() support. --disable-http-violations This allows you to remove code which is known to violate the HTTP protocol specification. @@ -4577,7 +4573,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4580 "configure"' > conftest.$ac_ext + echo '#line 4576 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5712,7 +5708,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5715:" \ +echo "$as_me:5711:" \ "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 @@ -6775,11 +6771,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:6778: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6774: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6782: \$? = $ac_status" >&5 + echo "$as_me:6778: \$? = $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. @@ -7043,11 +7039,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:7046: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7042: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7050: \$? = $ac_status" >&5 + echo "$as_me:7046: \$? = $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. @@ -7147,11 +7143,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:7150: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7146: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7154: \$? = $ac_status" >&5 + echo "$as_me:7150: \$? = $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 @@ -9492,7 +9488,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:11931: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11939: \$? = $ac_status" >&5 + echo "$as_me:11935: \$? = $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. @@ -12036,11 +12032,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:12039: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12035: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12043: \$? = $ac_status" >&5 + echo "$as_me:12039: \$? = $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 @@ -13606,11 +13602,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:13609: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13605: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13613: \$? = $ac_status" >&5 + echo "$as_me:13609: \$? = $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. @@ -13710,11 +13706,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:13713: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13709: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13717: \$? = $ac_status" >&5 + echo "$as_me:13713: \$? = $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 @@ -15913,11 +15909,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:15916: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15912: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15920: \$? = $ac_status" >&5 + echo "$as_me:15916: \$? = $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. @@ -16181,11 +16177,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:16184: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16180: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16188: \$? = $ac_status" >&5 + echo "$as_me:16184: \$? = $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. @@ -16285,11 +16281,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:16288: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16284: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16292: \$? = $ac_status" >&5 + echo "$as_me:16288: \$? = $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 @@ -20543,20 +20539,11 @@ fi # Check whether --enable-esi or --disable-esi was given. if test "${enable_esi+set}" = set; then enableval="$enable_esi" - ac_cv_use_esi=$enableval + use_esi=$enableval else - ac_cv_use_esi=no + use_esi=no fi; -echo "$as_me:$LINENO: checking whether to enable ESI" >&5 -echo $ECHO_N "checking whether to enable ESI... $ECHO_C" >&6 -if test "${ac_cv_use_esi+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_use_esi=no -fi -echo "$as_me:$LINENO: result: $ac_cv_use_esi" >&5 -echo "${ECHO_T}$ac_cv_use_esi" >&6 -if test "$ac_cv_use_esi" = "yes" ; then +if test "$use_esi" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define ESI 1 @@ -20594,20 +20581,11 @@ fi # Check whether --enable-icap-client or --disable-icap-client was given. if test "${enable_icap_client+set}" = set; then enableval="$enable_icap_client" - ac_cv_use_icap_client=$enableval + use_icap_client=$enableval else - ac_cv_use_icap_client=no + use_icap_client=no fi; -echo "$as_me:$LINENO: checking whether to enable the ICAP client" >&5 -echo $ECHO_N "checking whether to enable the ICAP client... $ECHO_C" >&6 -if test "${ac_cv_use_icap_client+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - ac_cv_use_icap_client=no -fi -echo "$as_me:$LINENO: result: $ac_cv_use_icap_client" >&5 -echo "${ECHO_T}$ac_cv_use_icap_client" >&6 -if test "$ac_cv_use_icap_client" = "yes" ; then +if test "$use_icap_client" = "yes" ; then cat >>confdefs.h <<\_ACEOF #define ICAP_CLIENT 1 @@ -20713,30 +20691,28 @@ _ACEOF fi; - - -if false; then - USE_SNMP_TRUE= - USE_SNMP_FALSE='#' -else - USE_SNMP_TRUE='#' - USE_SNMP_FALSE= -fi - +USE_SNMP=true # Check whether --enable-snmp or --disable-snmp was given. if test "${enable_snmp+set}" = set; then enableval="$enable_snmp" - if test "$enableval" = "yes" ; then - echo "SNMP monitoring enabled" + if test "$enableval" = "no" ; then + echo "SNMP monitoring disabled" + USE_SNMP= + fi + +fi; +if "$USE_SNMP" ; then cat >>confdefs.h <<\_ACEOF #define SQUID_SNMP 1 _ACEOF SNMPLIB='../snmplib/libsnmp.a' + makesnmplib=snmplib +fi -if true; then +if test x$USE_SNMP == xtrue; then USE_SNMP_TRUE= USE_SNMP_FALSE='#' else @@ -20744,11 +20720,6 @@ else USE_SNMP_FALSE= fi - SNMP_MAKEFILE=./snmplib/Makefile - makesnmplib=snmplib - fi - -fi; @@ -20834,6 +20805,7 @@ fi fi; +USE_HTCP=true if false; then @@ -20847,16 +20819,21 @@ fi # Check whether --enable-htcp or --disable-htcp was given. if test "${enable_htcp+set}" = set; then enableval="$enable_htcp" - if test "$enableval" = "yes" ; then - echo "HTCP enabled" + if test "$enableval" = "no" ; then + echo "HTCP support disabled" + fi + +fi; +if test x$USE_HTCP = xtrue; then cat >>confdefs.h <<\_ACEOF #define USE_HTCP 1 _ACEOF +fi -if true; then +if test x$USE_HTCP = xtrue; then ENABLE_HTCP_TRUE= ENABLE_HTCP_FALSE='#' else @@ -20864,9 +20841,6 @@ else ENABLE_HTCP_FALSE= fi - fi - -fi; @@ -21057,6 +21031,8 @@ _ACEOF fi; + +disable_poll= # Check whether --enable-poll or --disable-poll was given. if test "${enable_poll+set}" = set; then enableval="$enable_poll" @@ -21064,17 +21040,17 @@ if test "${enable_poll+set}" = set; then case "$enableval" in yes) echo "Forcing poll() to be enabled" - ac_cv_func_poll='yes' SELECT_TYPE="poll" ;; no) echo "Forcing poll() to be disabled" - ac_cv_func_poll='no' + disable_poll=true ;; esac fi; +disable_select= # Check whether --enable-select or --disable-select was given. if test "${enable_select+set}" = set; then enableval="$enable_select" @@ -21082,17 +21058,17 @@ if test "${enable_select+set}" = set; then case "$enableval" in yes) echo "Forcing select() to be enabled" - ac_cv_func_select='yes' SELECT_TYPE="select" ;; no) echo "Forcing select() to be disabled" - ac_cv_func_select='no' + disable_select=true ;; esac fi; +disable_kqueue=true # Check whether --enable-kqueue or --disable-kqueue was given. if test "${enable_kqueue+set}" = set; then enableval="$enable_kqueue" @@ -21100,17 +21076,17 @@ if test "${enable_kqueue+set}" = set; then case "$enableval" in yes) echo "Forcing kqueue() to be enabled" - ac_cv_func_kqueue='yes' SELECT_TYPE="kqueue" ;; no) echo "Forcing kqueue() to be disabled" - ac_cv_func_kqueue='no' + disable_kqueue=true ;; esac fi; +disable_epoll= # Check whether --enable-epoll or --disable-epoll was given. if test "${enable_epoll+set}" = set; then enableval="$enable_epoll" @@ -21118,12 +21094,11 @@ if test "${enable_epoll+set}" = set; then case "$enableval" in yes) echo "Forcing epoll() to be enabled" - ac_cv_func_epoll_ctl='yes' SELECT_TYPE="epoll" ;; no) echo "Forcing epoll() to be disabled" - ac_cv_func_epoll_ctl='no' + disable_epoll=true ;; esac @@ -24539,69 +24514,6 @@ presetting ac_cv_c_bigendian=no (or yes) will help" >&2;} esac -echo "$as_me:$LINENO: checking if ANSI prototypes work" >&5 -echo $ECHO_N "checking if ANSI prototypes work... $ECHO_C" >&6 -if test "${ac_cv_have_ansi_prototypes+set}" = set; then - echo $ECHO_N "(cached) $ECHO_C" >&6 -else - - cat >conftest.$ac_ext <<_ACEOF -/* confdefs.h. */ -_ACEOF -cat confdefs.h >>conftest.$ac_ext -cat >>conftest.$ac_ext <<_ACEOF -/* end confdefs.h. */ -int foo(char *); int foo (char *bar) {return 1;} -int -main () -{ -foo("bar") - ; - return 0; -} -_ACEOF -rm -f conftest.$ac_objext -if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 - (eval $ac_compile) 2>conftest.er1 - ac_status=$? - grep -v '^ *+' conftest.er1 >conftest.err - rm -f conftest.er1 - cat conftest.err >&5 - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); } && - { ac_try='test -z "$ac_c_werror_flag" - || test ! -s conftest.err' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; } && - { ac_try='test -s conftest.$ac_objext' - { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 - (eval $ac_try) 2>&5 - ac_status=$? - echo "$as_me:$LINENO: \$? = $ac_status" >&5 - (exit $ac_status); }; }; then - ac_cv_have_ansi_prototypes="yes" -else - echo "$as_me: failed program was:" >&5 -sed 's/^/| /' conftest.$ac_ext >&5 - -ac_cv_have_ansi_prototypes="no" -fi -rm -f conftest.err conftest.$ac_objext conftest.$ac_ext - -fi -echo "$as_me:$LINENO: result: $ac_cv_have_ansi_prototypes" >&5 -echo "${ECHO_T}$ac_cv_have_ansi_prototypes" >&6 -if test $ac_cv_have_ansi_prototypes = "yes" ; then - -cat >>confdefs.h <<\_ACEOF -#define HAVE_ANSI_PROTOTYPES 1 -_ACEOF - -fi - echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 if test "${ac_cv_struct_tm+set}" = set; then @@ -42727,26 +42639,25 @@ fi fi echo "$as_me:$LINENO: result: $ac_cv_epoll_works" >&5 echo "${ECHO_T}$ac_cv_epoll_works" >&6 - if test ac_cv_epoll_works = no && test ac_force_epoll = yes; then - echo "Error - no epoll found"; +fi +if test ac_cv_epoll_works != yes && test x$SELECT_TYPE = xepoll; then + echo "Error - no epoll support found"; echo "Try running 'sh ./scripts/get_epoll-lib.sh'"; echo "then run configure again"; exit -1 - fi fi if test -n "$SELECT_TYPE"; then : # Already decided above. Nothing to do here -elif test "$ac_cv_epoll_works" = "yes" ; then +elif test -z "$disable_epoll" && test "$ac_cv_epoll_works" = "yes" ; then SELECT_TYPE="epoll" -#comm_kqueue a bit broken. Don't enable automatically -#elif test "$ac_cv_func_kqueue" = "yes" ; then -# SELECT_TYPE="kqueue" -elif test "$ac_cv_func_poll" = "yes" ; then +elif test -z "$disable_kqueue" && test "$ac_cv_func_kqueue" = "yes" ; then + SELECT_TYPE="kqueue" +elif test -z "$disable_poll" && test "$ac_cv_func_poll" = "yes" ; then SELECT_TYPE="poll" -elif test "$ac_cv_func_select" = "yes" ; then +elif test -z "$disable_select" && test "$ac_cv_func_select" = "yes" ; then case "$host_os" in mingw|mingw32) SELECT_TYPE="select_win32" @@ -44474,13 +44385,6 @@ echo "$as_me: error: conditional \"USE_SNMP\" was never defined. Usually this means the macro was only invoked conditionally." >&2;} { (exit 1); exit 1; }; } fi -if test -z "${USE_SNMP_TRUE}" && test -z "${USE_SNMP_FALSE}"; then - { { echo "$as_me:$LINENO: error: conditional \"USE_SNMP\" was never defined. -Usually this means the macro was only invoked conditionally." >&5 -echo "$as_me: error: conditional \"USE_SNMP\" was never defined. -Usually this means the macro was only invoked conditionally." >&2;} - { (exit 1); exit 1; }; } -fi if test -z "${ENABLE_ARP_ACL_TRUE}" && test -z "${ENABLE_ARP_ACL_FALSE}"; then { { echo "$as_me:$LINENO: error: conditional \"ENABLE_ARP_ACL\" was never defined. Usually this means the macro was only invoked conditionally." >&5 diff --git a/include/autoconf.h.in b/include/autoconf.h.in index 4521d20533..41de686141 100644 --- a/include/autoconf.h.in +++ b/include/autoconf.h.in @@ -55,9 +55,6 @@ */ #undef HAVE_ALLOCA_H -/* Define if your compiler supports prototyping */ -#undef HAVE_ANSI_PROTOTYPES - /* Define to 1 if you have the header file. */ #undef HAVE_ARPA_INET_H