From: Amos Jeffries <squid3@treenet.co.nz>
Date: Sat, 24 Apr 2010 05:18:30 +0000 (+1200)
Subject: Real --enable-ipv6 fix
X-Git-Tag: SQUID_3_1_2~11
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a3e20181651bb1637916c9d5d0bff362e2862c02;p=thirdparty%2Fsquid.git

Real --enable-ipv6 fix
---

diff --git a/configure.in b/configure.in
index 67941f2b83..7d991489e5 100644
--- a/configure.in
+++ b/configure.in
@@ -2655,7 +2655,7 @@ AC_ARG_ENABLE(ipv6,
   AS_HELP_STRING([--disable-ipv6],[Disable IPv6 support]),
 [ case $enableval in
   yes|no)
-    use_ipng=yes
+    use_ipng=$enableval
     ;;
   *)
     ;;
@@ -2673,21 +2673,17 @@ 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>
-#error failure check.
         int main(int argc, char **argv) {
           if (socket(PF_INET6, SOCK_STREAM, 0) < 0)
             return 1;
           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
@@ -2696,7 +2692,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