[svn] Temporarily disable IPv6 by default.

diff --git a/configure.in b/configure.in
index a2d30ca88fd9fd5a1d251bddef9ac2744386901a..681b157b27677016bfae2a9739863f3445793f0b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -445,14 +445,6 @@ dnl **********************************************************************
 dnl Checks for IPv6
 dnl **********************************************************************
 
-dnl
-dnl If --enable-ipv6 is specified, we try to use IPv6 (as long as
-dnl getaddrinfo is also present).  If --disable-ipv6 is specified, we
-dnl don't use IPv6 or getaddrinfo.  If neither are specified, we test
-dnl whether it's possible to create an AF_INET6 socket and if yes, use
-dnl IPv6.
-dnl
-
 ipv6=
 check_for_ipv6=no
 AC_ARG_ENABLE(ipv6,
@@ -466,10 +458,10 @@ AC_ARG_ENABLE(ipv6,
     ipv6=yes
     ;;
   esac],
-  [check_for_ipv6=yes]
+  [check_for_ipv6=no]
 )
 
-if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
   AC_CHECK_FUNCS(getaddrinfo,[
     GETADDRINFO_AI_ADDRCONFIG(
       AC_DEFINE(
@@ -495,14 +487,14 @@ if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
   ])
 fi
   
-if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
   PROTO_INET6(,[
     AC_MSG_NOTICE([Disabling IPv6 support: your system does not support the PF_INET6 protocol family])
     ipv6=no
   ])
 fi
 
-if test "X$ipv6" = "Xyes" -o "X$check_for_ipv6" = "Xyes"; then
+if test "X$ipv6" = "Xyes" || test "X$check_for_ipv6" = "Xyes"; then
   TYPE_STRUCT_SOCKADDR_IN6([
     ipv6=yes
   ],[