---------------------
PatchSet 5513 
Date: 2007/08/28 00:10:46
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Prevent IPv6 --with-* options being tested when disabled

Members: 
	configure.in:1.63.2.49->1.63.2.50 

Index: squid3/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid3/configure.in,v
retrieving revision 1.63.2.49
retrieving revision 1.63.2.50
diff -u -r1.63.2.49 -r1.63.2.50
--- squid3/configure.in	28 Aug 2007 00:06:50 -0000	1.63.2.49
+++ squid3/configure.in	28 Aug 2007 00:10:46 -0000	1.63.2.50
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.63.2.49 2007/08/28 00:06:50 amosjeffries Exp $
+dnl  $Id: configure.in,v 1.63.2.50 2007/08/28 00:10:46 amosjeffries Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.63.2.49 $)dnl
+AC_REVISION($Revision: 1.63.2.50 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1730,35 +1730,6 @@
   fi
 ])
 
-dnl Check for Windows XP option
-AC_MSG_CHECKING([for IPv6 split-stack requirement])
-AC_ARG_WITH(ipv6-split-stack,
-  [  --with-ipv6-split-stack  Require IPv6 split-stack support (Requires IPv6 Support)],
-  [AC_DEFINE(IPV6_SPECIAL_SPLITSTACK, 1, [ 1 == Enable support for IPv6 on split-stack implementations]) AC_MSG_RESULT(yes)],
-  [AC_DEFINE(IPV6_SPECIAL_SPLITSTACK, 0, [ 0 == Disable support for split-stack IPv6 implementations]) AC_MSG_RESULT(no)]
-)
-
-dnl Check for IPv6 Windows Vista option
-AC_MSG_CHECKING([for IPv6 v4-mapping requirement])
-AC_ARG_WITH(ipv4-mapped,
-  [  --with-ipv4-mapped  Hybrid-Stack OS require Squid to do any v4-mapping (Requires IPv6 Support)],
-  [AC_DEFINE(IPV6_SPECIAL_V4MAPPING, 1, [ 1 == Perform v4-mapping internally]) AC_MSG_RESULT(yes)],
-  [AC_DEFINE(IPV6_SPECIAL_V4MAPPING, 0, [ 0 == Leave all v4-mapping to the OS]) AC_MSG_RESULT(no)]
-)
-
-dnl Check for IPv6-pure option
-AC_MSG_CHECKING([for IPv6-Localhost requirement])
-AC_ARG_WITH(localhost-ipv6,
-  [  --with-localhost-ipv6    Prefer IPv6 localhost address over IPv4 (Requires IPv6 Support).
-                           Treats 127.0.0.1 and ::1 as identical and converts all inputs of to ::1
-                           This depends on Dual-Stack support in the OS and all applications
-                           squid contacts via localhost being IPv6 enabled.
-                           Default: OFF. Treats these two IP as different, squid.conf must
-                           define both 127.0.0.1 and ::1 for the localhost ACL, etc. ],
-  [AC_DEFINE(IPV6_SPECIAL_LOCALHOST, 1, [ 1 == Convert IPv4-localhost requests to IPv6.]) AC_MSG_RESULT(yes)],
-  [AC_DEFINE(IPV6_SPECIAL_LOCALHOST, 0, [ 0 == Keep IPv4 and IPv6 Localhosts seperate.]) AC_MSG_RESULT(no)]
-)
-
 dnl Enable IPv6 support
 AC_MSG_CHECKING([whether to enable IPv6])
 AC_ARG_ENABLE(ipv6,
@@ -1793,6 +1764,37 @@
   AC_DEFINE(IPV6_SPECIAL_V4MAPPING,0,[ 0 == Leave v4-mapping to OS Implementation])
   AC_MSG_RESULT(no)
 ])
+if test $ac_cv_enable_ipv6 ; then
+dnl Check for Windows XP option
+AC_MSG_CHECKING([for IPv6 split-stack requirement])
+AC_ARG_WITH(ipv6-split-stack,
+  [  --with-ipv6-split-stack  Require IPv6 split-stack support (Requires IPv6 Support)],
+  [AC_DEFINE(IPV6_SPECIAL_SPLITSTACK, 1, [ 1 == Enable support for IPv6 on split-stack implementations]) AC_MSG_RESULT(yes)],
+  [AC_DEFINE(IPV6_SPECIAL_SPLITSTACK, 0, [ 0 == Disable support for split-stack IPv6 implementations]) AC_MSG_RESULT(no)]
+)
+
+dnl Check for IPv6 Windows Vista option
+AC_MSG_CHECKING([for IPv6 v4-mapping requirement])
+AC_ARG_WITH(ipv4-mapped,
+  [  --with-ipv4-mapped  Hybrid-Stack OS require Squid to do any v4-mapping (Requires IPv6 Support)],
+  [AC_DEFINE(IPV6_SPECIAL_V4MAPPING, 1, [ 1 == Perform v4-mapping internally]) AC_MSG_RESULT(yes)],
+  [AC_DEFINE(IPV6_SPECIAL_V4MAPPING, 0, [ 0 == Leave all v4-mapping to the OS]) AC_MSG_RESULT(no)]
+)
+
+dnl Check for IPv6-pure option
+AC_MSG_CHECKING([for IPv6-Localhost requirement])
+AC_ARG_WITH(localhost-ipv6,
+  [  --with-localhost-ipv6    Prefer IPv6 localhost address over IPv4 (Requires IPv6 Support).
+                           Treats 127.0.0.1 and ::1 as identical and converts all inputs of to ::1
+                           This depends on Dual-Stack support in the OS and all applications
+                           squid contacts via localhost being IPv6 enabled.
+                           Default: OFF. Treats these two IP as different, squid.conf must
+                           define both 127.0.0.1 and ::1 for the localhost ACL, etc. ],
+  [AC_DEFINE(IPV6_SPECIAL_LOCALHOST, 1, [ 1 == Convert IPv4-localhost requests to IPv6.]) AC_MSG_RESULT(yes)],
+  [AC_DEFINE(IPV6_SPECIAL_LOCALHOST, 0, [ 0 == Keep IPv4 and IPv6 Localhosts seperate.]) AC_MSG_RESULT(no)]
+)
+# end IPv6-only options
+fi
 
 AC_ARG_WITH(filedescriptors,
 [  --with-filedescriptors=NUMBER