From: Henrik Nordstrom <henrik@henriknordstrom.net>
Date: Thu, 29 Oct 2009 23:59:26 +0000 (+0100)
Subject: Temporary patch forcing LINUX_TPROXY2 disabled if requirements unmet.
X-Git-Tag: SQUID_3_2_0_1~641
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1bffb95590e477f15d524f9d22bf8f4cce04fb8d;p=thirdparty%2Fsquid.git

Temporary patch forcing LINUX_TPROXY2 disabled if requirements unmet.

will be redone later to properly wind up dependencies and enabling of LINUX_TPROXY2 & friends.
---

diff --git a/configure.in b/configure.in
index 6d37602265..0d7d3b9f88 100644
--- a/configure.in
+++ b/configure.in
@@ -3530,6 +3530,8 @@ fi
 if test "$LINUX_NETFILTER" = "no" ; then
     AC_MSG_WARN([Cannot find necessary Linux kernel (Netfilter) header files])
     AC_MSG_WARN([Linux Transparent and Intercepting Proxy support WILL NOT be enabled])
+    LINUX_TPROXY2="no"
+    AC_DEFINE(LINUX_TPROXY2, 0, [Enable real Transparent Proxy support for Netfilter TPROXY v2.])
     sleep 10
 fi
 dnl Netfilter TPROXY depends on libcap but the NAT parts can still work.
@@ -3537,6 +3539,8 @@ if test "$LINUX_NETFILTER" = "yes" && test "$use_libcap" != "yes" ; then
     AC_MSG_WARN([Missing needed capabilities (libcap or libcap2) for TPROXY])
     AC_MSG_WARN([Linux Transparent Proxy support WILL NOT be enabled])
     AC_MSG_WARN([Reduced support to Interception Proxy])
+    LINUX_TPROXY2="no"
+    AC_DEFINE(LINUX_TPROXY2, 0, [Enable real Transparent Proxy support for Netfilter TPROXY v2.])
     sleep 10
 fi
 
@@ -3564,6 +3568,8 @@ if test "$LINUX_TPROXY2"; then
   else
     AC_MSG_WARN([Missing needed capabilities (libcap or libcap2) for TPROXY v2])
     AC_MSG_WARN([Linux Transparent Proxy support WILL NOT be enabled])
+    LINUX_TPROXY2="no"
+    AC_DEFINE(LINUX_TPROXY2, 0, [Enable real Transparent Proxy support for Netfilter TPROXY v2.])
     sleep 10
   fi
 fi