Correct settings for v4-mapped.

Its always useful in IPv6. Unless split-stack has been requested.

diff --git a/configure.in b/configure.in
index 5a029715922d9db8838e8010b9e7151e312100e6..1587484b17e28f70eac03c642ada5abcc4a18997 100755 (executable)
--- a/configure.in
+++ b/configure.in
@@ -1862,7 +1862,7 @@ AC_ARG_ENABLE(ipv6,
         AC_MSG_RESULT(yes)
         use_ipng=yes
       ],
-      [ AC_DEFINE(USE_IPV6,0,[0 == Disable support for IPv6])
+      [ AC_DEFINE(USE_IPV6,0,[Enable support for IPv6])
         AC_DEFINE(IPV6_SPECIAL_SPLITSTACK,0,[Enable support for IPv6 on split-stack implementations])
         AC_DEFINE(IPV6_SPECIAL_LOCALHOST,0,[Convert IPv4-localhost requests to IPv6. Default: Keep seperate.])
         AC_DEFINE(IPV6_SPECIAL_V4MAPPED,0,[Enable v4-mapping through v6 sockets])
@@ -1870,7 +1870,7 @@ AC_ARG_ENABLE(ipv6,
       ])
    )
 ],
-[ AC_DEFINE(USE_IPV6,0,[Disable support for IPv6])
+[ AC_DEFINE(USE_IPV6,0,[Enable support for IPv6])
   AC_DEFINE(IPV6_SPECIAL_SPLITSTACK,0,[Enable support for IPv6 on split-stack implementations])
   AC_DEFINE(IPV6_SPECIAL_LOCALHOST,0,[Convert IPv4-localhost requests to IPv6. Default: Keep seperate.])
   AC_DEFINE(IPV6_SPECIAL_V4MAPPED,0,[Enable v4-mapping through v6 sockets])
@@ -1879,29 +1879,21 @@ AC_ARG_ENABLE(ipv6,
 
 if test "$use_ipng" = "yes"; then
 
+dnl Check for IPv6 Windows Vista option
+dnl Also useful for other OS with hybrid-stack defaults turned OFF
+AC_DEFINE(IPV6_SPECIAL_V4MAPPED, 1, [Enable v4-mapping through v6 sockets])
+
 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, [Enable support for IPv6 on split-stack implementations]) AC_MSG_RESULT(yes)],
+  [ AC_DEFINE(IPV6_SPECIAL_SPLITSTACK, 1, [Enable support for IPv6 on split-stack implementations])
+    AC_DEFINE(IPV6_SPECIAL_V4MAPPED, 0, [Enable v4-mapping through v6 sockets. Requires IPv6 hybrid-stack.])
+    AC_MSG_RESULT(yes)
+  ],
   [AC_DEFINE(IPV6_SPECIAL_SPLITSTACK, 0, [Enable support for IPv6 on split-stack implementations]) AC_MSG_RESULT(no)]
 )
 
-dnl Check for IPv6 Windows Vista option
-dnl Also useful for other OS with hybrid-stack defaults turned OFF
-use_v4map=yes
-AC_MSG_CHECKING([for IPv6 v4-mapping requirement])
-AC_ARG_WITH(ipv4-mapped,
-  [  --with-ipv4-mapped  Squid uses Hybrid-Stack features to do v4-mapping. Requires IPv6 Support.],
-  [use_v4map=yes],
-  [use_v4map=no]
-)
-if test "x$use_v4map" = "xyes" ; then
-    AC_DEFINE(IPV6_SPECIAL_V4MAPPED, 1, [Enable v4-mapping through v6 sockets]) AC_MSG_RESULT(yes)],
-else
-    AC_DEFINE(IPV6_SPECIAL_V4MAPPED, 0, [Enable v4-mapping through v6 sockets]) AC_MSG_RESULT(no)]    
-fi
-
 dnl Check for IPv6-pure option
 AC_MSG_CHECKING([for IPv6-Localhost requirement])
 AC_ARG_WITH(localhost-ipv6,