Author: Henrik Nordstrom <henrik@henriknordstrom.net>

Various TPROXYv2 detection fixes

 * Typo in quoting of build option
 * 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 ab7a82a4f06ac03c08d2720d0b6009c0a1112076..fdf051fa8c4f04ae34ae8fe3ba3a8de93a70b21a 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1504,7 +1504,7 @@ AC_ARG_ENABLE(linux-tproxy,
   AS_HELP_STRING([--enable-linux-tproxy],[Enable real Transparent Proxy support for Netfilter TPROXY 
                   (version 2).]),
 [ if test "$enableval" = "yes" ; then
-       AC_MSG_NOTICE(["Linux Netfilter/TPROXY v2 enabled])
+       AC_MSG_NOTICE([Linux Netfilter/TPROXY v2 enabled])
        AC_DEFINE(LINUX_TPROXY2, 1, [Enable real Transparent Proxy support for Netfilter TPROXY v2.])
        LINUX_TPROXY2="yes"
         if test -z "$LINUX_NETFILTER"; then
@@ -3267,6 +3267,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.
@@ -3274,6 +3276,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
 
@@ -3301,6 +3305,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