---------------------
PatchSet 5503 
Date: 2007/08/27 02:40:56
Author: amosjeffries
Branch: squid3-ipv6
Tag: (none) 
Log:
Tidy configure dsplay of IPv6 checks.

Members: 
	configure.in:1.63.2.46->1.63.2.47 
	lib/Makefile.am:1.12.4.11->1.12.4.12 

Index: squid3/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid3/configure.in,v
retrieving revision 1.63.2.46
retrieving revision 1.63.2.47
diff -u -r1.63.2.46 -r1.63.2.47
--- squid3/configure.in	27 Aug 2007 02:22:14 -0000	1.63.2.46
+++ squid3/configure.in	27 Aug 2007 02:40:56 -0000	1.63.2.47
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.63.2.46 2007/08/27 02:22:14 amosjeffries Exp $
+dnl  $Id: configure.in,v 1.63.2.47 2007/08/27 02:40:56 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.46 $)dnl
+AC_REVISION($Revision: 1.63.2.47 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -1734,18 +1734,20 @@
 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_DEFINE(IPV6_SPECIAL_SPLITSTACK, 0, [ 0 == Disable support for split-stack IPv6 implementations])
+  [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_DEFINE(IPV6_SPECIAL_V4MAPPING, 0, [ 0 == Leave all v4-mapping to the OS])
+  [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
@@ -1753,8 +1755,8 @@
                            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_DEFINE(IPV6_SPECIAL_LOCALHOST, 0, [ 0 == Keep IPv4 and IPv6 Localhosts seperate.])
+  [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
Index: squid3/lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid3/lib/Makefile.am,v
retrieving revision 1.12.4.11
retrieving revision 1.12.4.12
diff -u -r1.12.4.11 -r1.12.4.12
--- squid3/lib/Makefile.am	19 Aug 2007 11:03:08 -0000	1.12.4.11
+++ squid3/lib/Makefile.am	27 Aug 2007 02:40:56 -0000	1.12.4.12
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-#  $Id: Makefile.am,v 1.12.4.11 2007/08/19 11:03:08 amosjeffries Exp $
+#  $Id: Makefile.am,v 1.12.4.12 2007/08/27 02:40:56 amosjeffries Exp $
 #
 
 DIST_SUBDIRS = libTrie
@@ -48,11 +48,9 @@
 endif
 
 EXTRA_LIBRARIES = \
-	libdlmalloc.a \
 	libregex.a \
 	libsspwin32.a
 noinst_LIBRARIES = \
-	@LIBDLMALLOC@ \
 	libmiscutil.a \
 	libntlmauth.a \
 	$(LIBSSPWIN32) \
@@ -98,8 +96,6 @@
 # $(top_srcdir)/include/version.h should be a dependency
 libregex_a_SOURCES = \
 	GNUregex.c
-libdlmalloc_a_SOURCES = \
-	dlmalloc.c
 libntlmauth_a_SOURCES = \
 	ntlmauth.c
 libntlmauth_a_LIBADD = \