From 7757a8a7ee5704d1bca3824b2b7d3becd6b62732 Mon Sep 17 00:00:00 2001
From: Timo Sirainen <tss@iki.fi>
Date: Thu, 23 Apr 2009 14:02:09 -0400
Subject: [PATCH] configure: Removed --disable-ipv6 parameter. There's really
 no point having it. Originally it was added back when some OSes had broken
 IPv6 support, but those OSes should be long gone by now. Also we still
 support automatically building without IPv6 support if it's not detected.

--HG--
branch : HEAD
---
 configure.in | 44 +++++++++++++++-----------------------------
 1 file changed, 15 insertions(+), 29 deletions(-)

diff --git a/configure.in b/configure.in
index 1ec7c104ec..43598a12bc 100644
--- a/configure.in
+++ b/configure.in
@@ -25,15 +25,6 @@ CPPFLAGS=-I$2/include LDFLAGS=-L$2/lib ./configure --with-$1])
   fi
 ])
 
-AC_ARG_ENABLE(ipv6,
-[  --enable-ipv6           Enable IPv6 support (auto)],
-	if test x$enableval = xno || test x$enableval = xauto; then
-		want_ipv6=$enableval
-	else
-		want_ipv6=yes
-	fi,
-	want_ipv6=auto)
-
 AC_ARG_ENABLE(devel-checks,
 [  --enable-devel-checks   Enable some extra expensive checks for developers],
 	if test x$enableval = xyes; then
@@ -2179,26 +2170,22 @@ dnl ** IPv6 support
 dnl **
 
 have_ipv6=no
-if test "$want_ipv6" != no; then
-	AC_MSG_CHECKING([for IPv6])
-	AC_CACHE_VAL(i_cv_type_in6_addr,
-	[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
-	#include <sys/types.h>
-	#include <sys/socket.h>
-	#include <netinet/in.h>
-	#include <netdb.h>
-	#include <arpa/inet.h>]],
-	[[struct in6_addr i;]])],
-	[i_cv_type_in6_addr=yes],
-	[i_cv_type_in6_addr=no])])
-	if test $i_cv_type_in6_addr = yes; then
-		AC_DEFINE(HAVE_IPV6,, Build with IPv6 support)
-		have_ipv6=yes
-	elif test $want_ipv6 = yes; then
-		AC_ERROR([IPv6 support not found])
-	fi
-	AC_MSG_RESULT($i_cv_type_in6_addr)
+AC_MSG_CHECKING([for IPv6])
+AC_CACHE_VAL(i_cv_type_in6_addr,
+[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <arpa/inet.h>]],
+[[struct in6_addr i;]])],
+[i_cv_type_in6_addr=yes],
+[i_cv_type_in6_addr=no])])
+if test $i_cv_type_in6_addr = yes; then
+	AC_DEFINE(HAVE_IPV6,, Build with IPv6 support)
+	have_ipv6=yes
 fi
+AC_MSG_RESULT($i_cv_type_in6_addr)
 
 dnl **
 dnl ** storage classes
@@ -2451,7 +2438,6 @@ echo "File offsets ........................ : ${offt_bits}bit"
 echo "I/O loop method ..................... : $ioloop"
 echo "File change notification method ..... : $have_notify"
 echo "Building with SSL support ........... : $have_ssl"
-echo "Building with IPv6 support .......... : $have_ipv6"
 echo "Building with GSSAPI support ........ : $have_gssapi"
 echo "Building with user database modules . :$userdb"
 echo "Building with password lookup modules :$passdb"
-- 
2.47.3