Add a --disable-ipv6-support switch for platforms where support is detected but doesn...

diff --git a/configure.in b/configure.in
index 42e0fb5..cfae585 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 dnl Process this file with autoconf to produce a configure script.
 dnl 
 dnl Process this file with autoconf to produce a configure script.
 dnl 

-dnl $Id: configure.in,v 1.150 2011/04/16 17:28:15 fabiankeil Exp $
+dnl $Id: configure.in,v 1.151 2011/04/19 11:42:12 fabiankeil Exp $

 dnl 
 dnl Written by and Copyright (C) 2001-2010 the
 dnl Privoxy team. http://www.privoxy.org/
 dnl 
 dnl Written by and Copyright (C) 2001-2010 the
 dnl Privoxy team. http://www.privoxy.org/


@@ -32,7 +32,7 @@ dnl =================================================================
 dnl AutoConf Initialization
 dnl =================================================================
 
 dnl AutoConf Initialization
 dnl =================================================================
 

-AC_REVISION($Revision: 1.150 $)
+AC_REVISION($Revision: 1.151 $)

 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then


@@ -714,7 +714,16 @@ dnl AC_FUNC_STAT
 AC_CHECK_FUNCS([access atexit getcwd gethostbyaddr gethostbyaddr_r gethostbyname gethostbyname_r gettimeofday inet_ntoa localtime_r memchr memmove memset poll putenv random regcomp select setlocale snprintf socket strchr strdup strerror strftime strlcat strlcpy strptime strstr strtoul timegm tzset])
 
 dnl Checks for RFC 2553 resolver and socket functions
 AC_CHECK_FUNCS([access atexit getcwd gethostbyaddr gethostbyaddr_r gethostbyname gethostbyname_r gettimeofday inet_ntoa localtime_r memchr memmove memset poll putenv random regcomp select setlocale snprintf socket strchr strdup strerror strftime strlcat strlcpy strptime strstr strtoul timegm tzset])
 
 dnl Checks for RFC 2553 resolver and socket functions

-if test $target_type = mingw; then
+AC_ARG_ENABLE(ipv6-support,
+[  --disable-ipv6-support          Disable IPv6 support and other RFC-2554-related improvements],
+[if test $enableval = yes; then
+  enable_ipv6_support=yes
+fi], enable_ipv6_support=yes)
+
+if test $enable_ipv6_support != yes; then
+  AC_MSG_WARN([Skipping checks for IPv6 support and other RFC-2554-related improvements.
+    Due to lock contention, this may result in slower DNS resolution for IPv4 setups, too.])
+elif test $target_type = mingw; then

   AC_CHECK_LIB(ws2_32, main)
 
   AC_MSG_CHECKING(getaddrinfo in ws2_32)
   AC_CHECK_LIB(ws2_32, main)
 
   AC_MSG_CHECKING(getaddrinfo in ws2_32)