From: serassio <> Date: Sun, 15 Apr 2007 20:49:54 +0000 (+0000) Subject: Bootstrapped X-Git-Tag: SQUID_3_0_PRE6~90 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=e66a60c161379f22a9dbc39f98e488c962f673bb;p=thirdparty%2Fsquid.git Bootstrapped --- diff --git a/configure b/configure index a4289d7f93..96bf1212ff 100755 --- a/configure +++ b/configure @@ -1,5 +1,5 @@ #! /bin/sh -# From configure.in Revision: 1.449 . +# 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.PRE5-CVS. # @@ -1140,6 +1140,8 @@ Optional Features: using PF network address redirection. --enable-linux-netfilter Enable Transparent Proxy support for Linux (Netfilter) systems. + --enable-linux-tproxy + Enable real Transparent Proxy support for Netfilter TPROXY. --enable-leakfinder Enable Leak Finding code. Enabling this alone does nothing; you also have to modify the source @@ -4572,7 +4574,7 @@ ia64-*-hpux*) ;; *-*-irix6*) # Find out which ABI we are using. - echo '#line 4575 "configure"' > conftest.$ac_ext + echo '#line 4577 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -5707,7 +5709,7 @@ fi # Provide some information about the compiler. -echo "$as_me:5710:" \ +echo "$as_me:5712:" \ "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 @@ -6770,11 +6772,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:6773: $lt_compile\"" >&5) + (eval echo "\"\$as_me:6775: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:6777: \$? = $ac_status" >&5 + echo "$as_me:6779: \$? = $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. @@ -7038,11 +7040,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:7041: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7043: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:7045: \$? = $ac_status" >&5 + echo "$as_me:7047: \$? = $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. @@ -7142,11 +7144,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:7145: $lt_compile\"" >&5) + (eval echo "\"\$as_me:7147: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:7149: \$? = $ac_status" >&5 + echo "$as_me:7151: \$? = $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 @@ -9487,7 +9489,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:11932: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:11934: \$? = $ac_status" >&5 + echo "$as_me:11936: \$? = $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. @@ -12031,11 +12033,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:12034: $lt_compile\"" >&5) + (eval echo "\"\$as_me:12036: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:12038: \$? = $ac_status" >&5 + echo "$as_me:12040: \$? = $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 @@ -13601,11 +13603,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:13604: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13606: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:13608: \$? = $ac_status" >&5 + echo "$as_me:13610: \$? = $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. @@ -13705,11 +13707,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:13708: $lt_compile\"" >&5) + (eval echo "\"\$as_me:13710: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:13712: \$? = $ac_status" >&5 + echo "$as_me:13714: \$? = $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 @@ -15908,11 +15910,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:15911: $lt_compile\"" >&5) + (eval echo "\"\$as_me:15913: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:15915: \$? = $ac_status" >&5 + echo "$as_me:15917: \$? = $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. @@ -16176,11 +16178,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:16179: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16181: $lt_compile\"" >&5) (eval "$lt_compile" 2>conftest.err) ac_status=$? cat conftest.err >&5 - echo "$as_me:16183: \$? = $ac_status" >&5 + echo "$as_me:16185: \$? = $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. @@ -16280,11 +16282,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:16283: $lt_compile\"" >&5) + (eval echo "\"\$as_me:16285: $lt_compile\"" >&5) (eval "$lt_compile" 2>out/conftest.err) ac_status=$? cat out/conftest.err >&5 - echo "$as_me:16287: \$? = $ac_status" >&5 + echo "$as_me:16289: \$? = $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 @@ -21339,6 +21341,25 @@ if test -n "$buildmodel" && test "$buildmodel" != "default"; then esac fi +# Check whether --enable-linux-tproxy or --disable-linux-tproxy was given. +if test "${enable_linux_tproxy+set}" = set; then + enableval="$enable_linux_tproxy" + if test "$enableval" = "yes" ; then + echo "Linux Netfilter/TPROXY enabled" + +cat >>confdefs.h <<\_ACEOF +#define LINUX_TPROXY 1 +_ACEOF + + LINUX_TPROXY="yes" + if test -z "$LINUX_NETFILTER"; then + echo "Linux-Netfilter Transparent Proxy automatically enabled" + LINUX_NETFILTER="yes" + fi + fi + +fi; + if false; then @@ -23708,7 +23729,10 @@ done -for ac_header in linux/netfilter_ipv4.h + +for ac_header in linux/netfilter_ipv4.h \ + linux/netfilter_ipv4/ip_tproxy.h \ + do as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh` echo "$as_me:$LINENO: checking for $ac_header" >&5 @@ -42762,6 +42786,35 @@ if test "$LINUX_NETFILTER" = "no" ; then sleep 10 fi +if test "$LINUX_TPROXY" ; then + echo "$as_me:$LINENO: checking if TPROXY header files are installed" >&5 +echo $ECHO_N "checking if TPROXY header files are installed... $ECHO_C" >&6 + # hold on to your hats... + if test "$ac_cv_header_linux_netfilter_ipv4_ip_tproxy_h" = "yes" && test "$LINUX_NETFILTER" = "yes"; then + LINUX_TPROXY="yes" + +cat >>confdefs.h <<\_ACEOF +#define LINUX_TPROXY 1 +_ACEOF + + else + LINUX_TPROXY="no" + +cat >>confdefs.h <<\_ACEOF +#define LINUX_TPROXY 0 +_ACEOF + + fi + echo "$as_me:$LINENO: result: $LINUX_TPROXY" >&5 +echo "${ECHO_T}$LINUX_TPROXY" >&6 +fi +if test "$LINUX_TPROXY" = "no" && test "$LINUX_NETFILTER" = "yes"; then + echo "WARNING: Cannot find TPROXY headers, you need to install the" + echo "tproxy package from:" + echo " - lynx http://www.balabit.com/downloads/tproxy/" + sleep 10 +fi + if test -z "$USE_GNUREGEX" ; then case "$host" in *-sun-solaris2.[0-4]) diff --git a/include/autoconf.h.in b/include/autoconf.h.in index e8efc39f81..021fae39d8 100644 --- a/include/autoconf.h.in +++ b/include/autoconf.h.in @@ -275,7 +275,8 @@ /* Define to 1 if you have the header file. */ #undef HAVE_LINUX_NETFILTER_IPV4_H -/* Define to 1 if you have the header file. */ +/* Define to 1 if you have the header file. + */ #undef HAVE_LINUX_NETFILTER_IPV4_IP_TPROXY_H /* long is defined in system headers */