X-Git-Url: http://www.privoxy.org/gitweb/?a=blobdiff_plain;f=configure.in;h=b406a8997c22159d88cce44e16f1e327b0795d06;hb=09d63524e6c5d6196082a55fa4775635da8a9794;hp=42e0fb59619ed9704e71bf3f4306cf9e7683364e;hpb=1419f524f8b8c1112c3f85b775fb3ceffbaf6853;p=privoxy.git

diff --git a/configure.in b/configure.in
index 42e0fb59..b406a899 100644
--- a/configure.in
+++ b/configure.in
@@ -1,6 +1,6 @@
 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.152 2011/04/19 11:42:51 fabiankeil Exp $
 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 =================================================================
 
-AC_REVISION($Revision: 1.150 $)
+AC_REVISION($Revision: 1.152 $)
 AC_INIT(jcc.c)
 
 if test ! -f config.h.in; then
@@ -315,7 +315,7 @@ else
 fi
 AC_SUBST(WIN_ONLY)
 
-dnl Checking which text html browser we have avaliable
+dnl Checking which text html browser we have available
 if test $dodk != no; then
 	AC_CHECK_PROGS(WDUMP,w3m lynx links,false)
 	if test "$WDUMP" = false; 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
-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)
@@ -983,7 +992,7 @@ dnl =================================================================
 dnl Final cleanup and output
 dnl =================================================================
 
-dnl Remove the SPECIAL_CFLAGS stuff from CFLAGS, and add it seperately
+dnl Remove the SPECIAL_CFLAGS stuff from CFLAGS, and add it separately
 dnl in the Makefile
 CFLAGS=$old_CFLAGS_nospecial
 AC_SUBST(SPECIAL_CFLAGS)