nihilist/tor
1
0
Fork 0
mirror of https://gitlab.torproject.org/tpo/core/tor.git synced 2024-11-27 13:53:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix #19449 Remove --disable-transparent configure option

Browse Source
This commit is contained in:
U+039b 2016-06-22 20:34:56 +02:00 committed by Nick Mathewson
parent 8938250c10
commit e607a2d9a0
1 changed files with 18 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
configure.ac
View File

@ -72,14 +72,6 @@ fi
AM_CONDITIONAL(USE_OPENBSD_MALLOC, test "x$enable_openbsd_malloc" = "xyes") AM_CONDITIONAL(USE_OPENBSD_MALLOC, test "x$enable_openbsd_malloc" = "xyes")
AC_ARG_ENABLE(transparent,
AS_HELP_STRING(--disable-transparent, [disable transparent proxy support]),
[case "${enableval}" in
"yes") transparent=true ;;
"no") transparent=false ;;
*) AC_MSG_ERROR(bad value for --enable-transparent) ;;
esac], [transparent=true])
AC_ARG_ENABLE(asciidoc, AC_ARG_ENABLE(asciidoc,
AS_HELP_STRING(--disable-asciidoc, [don't use asciidoc (disables building of manpages)]), AS_HELP_STRING(--disable-asciidoc, [don't use asciidoc (disables building of manpages)]),
[case "${enableval}" in [case "${enableval}" in
@ -1140,26 +1132,24 @@ AC_CHECK_HEADERS(linux/netfilter_ipv6/ip6_tables.h,
#include <linux/if.h> #include <linux/if.h>
#endif]) #endif])
if test "x$transparent" = "xtrue"; then transparent_ok=0
transparent_ok=0 if test "x$net_if_found" = "x1" && test "x$net_pfvar_found" = "x1"; then
if test "x$net_if_found" = "x1" && test "x$net_pfvar_found" = "x1"; then transparent_ok=1
transparent_ok=1 fi
fi if test "x$linux_netfilter_ipv4" = "x1"; then
if test "x$linux_netfilter_ipv4" = "x1"; then transparent_ok=1
transparent_ok=1 fi
fi if test "x$linux_netfilter_ipv6_ip6_tables" = "x1"; then
if test "x$linux_netfilter_ipv6_ip6_tables" = "x1"; then transparent_ok=1
transparent_ok=1 fi
fi if test "x$transparent_ok" = "x1"; then
if test "x$transparent_ok" = "x1"; then AC_DEFINE(USE_TRANSPARENT, 1, "Define to enable transparent proxy support")
AC_DEFINE(USE_TRANSPARENT, 1, "Define to enable transparent proxy support") case "$host" in
case "$host" in *-*-openbsd* | *-*-bitrig*)
*-*-openbsd* | *-*-bitrig*) AC_DEFINE(OPENBSD, 1, "Define to handle pf on OpenBSD properly") ;;
AC_DEFINE(OPENBSD, 1, "Define to handle pf on OpenBSD properly") ;; esac
esac else
else AC_MSG_NOTICE([Transparent proxy support enabled, but missing headers.])
AC_MSG_NOTICE([Transparent proxy support enabled, but missing headers.])
fi
fi fi
AC_CHECK_MEMBERS([struct timeval.tv_sec], , , AC_CHECK_MEMBERS([struct timeval.tv_sec], , ,