From: Amos Jeffries <amosjeffries@squid-cache.org>
Date: Sat, 24 Apr 2010 02:21:25 +0000 (-0600)
Subject: Real --enable-ipv6 fix
X-Git-Tag: SQUID_3_2_0_1~274
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d29be12aef96a15e669f1da17c452083c3736b3;p=thirdparty%2Fsquid.git

Real --enable-ipv6 fix
---

diff --git a/configure.in b/configure.in
index 056ad9a5db..4f8a4f475d 100644
--- a/configure.in
+++ b/configure.in
@@ -2681,7 +2681,7 @@ AC_ARG_ENABLE(ipv6,
   AS_HELP_STRING([--disable-ipv6],[Disable IPv6 support]),
 [ case $enableval in
   yes|no)
-    use_ipng=yes
+    use_ipng=$enableval
     ;;
   *)
     ;;
@@ -2699,7 +2699,7 @@ if test "$use_ipng" != "no"; then
     *)
       ;;
   esac
-  AC_CACHE_CHECK([if PF_INET6 is available], $squid_cv_pf_inet6,
+  AC_CACHE_CHECK([if PF_INET6 is available], squid_cv_pf_inet6,
     AC_RUN_IFELSE([AC_LANG_SOURCE([[ /* PF_INET6 available check */
 #       include <sys/types.h>
 #       include <sys/socket.h>
@@ -2709,10 +2709,7 @@ if test "$use_ipng" != "no"; then
           else
             return 0;
         }
-      ]])],[ AC_MSG_RESULT(yes)
-		squid_cv_pf_inet6="yes"
-		SAVED_LIBS="$LIBS" ],[ AC_MSG_RESULT(no)
-		squid_cv_pf_inet6="no"],[])
+      ]])],[squid_cv_pf_inet6="yes" ; SAVED_LIBS="$LIBS"],[squid_cv_pf_inet6="no"],[])
    )
    LIBS="$SAVED_LIBS"
 fi
@@ -2721,7 +2718,7 @@ fi
 # unless --enable-ipv6 is explicitly used. in which case it's a hard fail.
 if test "x$use_ipng" = "xyes" && test "x$squid_cv_pf_inet6" = "xno"; then
 	AC_MSG_ERROR([IPv6 cannot be built on this system. Basic kernel definitions are missing.])
-else
+elif test "x$use_ipng" = "xauto" && test "x$squid_cv_pf_inet6" = "xno"; then
 	AC_MSG_WARN([IPv6 cannot be built on this system. Basic kernel definitions are missing.])
 fi