---------------------
PatchSet 3089 
Date: 2001/10/02 22:34:33
Author: akroonmaa
Branch: chunked_mempools
Tag: (none) 
Log:
bring branch to automake style

Members: 
	acconfig.h:1.6.6.4->1.6.6.5 
	configure.in:1.19.6.5->1.19.6.6 
	lib/Makefile.am:1.2.18.1->1.2.18.2 
	src/Makefile.am:1.5.4.1->1.5.4.2 

Index: squid/acconfig.h
===================================================================
RCS file: /cvsroot/squid-sf//squid/Attic/acconfig.h,v
retrieving revision 1.6.6.4
retrieving revision 1.6.6.5
diff -u -r1.6.6.4 -r1.6.6.5
--- squid/acconfig.h	1 Oct 2001 11:06:41 -0000	1.6.6.4
+++ squid/acconfig.h	2 Oct 2001 22:34:33 -0000	1.6.6.5
@@ -23,7 +23,7 @@
 #ifndef __CONFIGURE_H__
 #define __CONFIGURE_H__
 @TOP@
-/* $Id: acconfig.h,v 1.6.6.4 2001/10/01 11:06:41 akroonmaa Exp $ */
+/* $Id: acconfig.h,v 1.6.6.5 2001/10/02 22:34:33 akroonmaa Exp $ */
 
 /*********************************
  * START OF CONFIGURABLE OPTIONS *
@@ -48,6 +48,9 @@
 #undef CACHE_ICP_PORT
 #endif
 
+/* Compile & use the malloc package by Doug Lea] */
+#undef USE_DLMALLOC
+
 /* Define to do simple malloc debugging */
 #undef XMALLOC_DEBUG
 
Index: squid/configure.in
===================================================================
RCS file: /cvsroot/squid-sf//squid/configure.in,v
retrieving revision 1.19.6.5
retrieving revision 1.19.6.6
diff -u -r1.19.6.5 -r1.19.6.6
--- squid/configure.in	1 Oct 2001 11:06:41 -0000	1.19.6.5
+++ squid/configure.in	2 Oct 2001 22:34:33 -0000	1.19.6.6
@@ -3,7 +3,7 @@
 dnl
 dnl  Duane Wessels, wessels@nlanr.net, February 1996 (autoconf v2.9)
 dnl
-dnl  $Id: configure.in,v 1.19.6.5 2001/10/01 11:06:41 akroonmaa Exp $
+dnl  $Id: configure.in,v 1.19.6.6 2001/10/02 22:34:33 akroonmaa Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@
 AC_CONFIG_AUX_DIR(cfgaux)
 AM_INIT_AUTOMAKE(Squid, 2.5-DEVEL)
 AM_CONFIG_HEADER(include/autoconf.h)
-AC_REVISION($Revision: 1.19.6.5 $)dnl
+AC_REVISION($Revision: 1.19.6.6 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 
 dnl Set default LDFLAGS
@@ -207,6 +207,7 @@
     ac_cv_header_gnumalloc_h="no"
     ac_cv_lib_malloc="no"
     ac_cv_enabled_dlmalloc="yes"
+    AC_DEFINE(USE_DLMALLOC, 1)
 fi
 
 AC_SUBST(LIBDLMALLOC)
Index: squid/lib/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/lib/Makefile.am,v
retrieving revision 1.2.18.1
retrieving revision 1.2.18.2
diff -u -r1.2.18.1 -r1.2.18.2
--- squid/lib/Makefile.am	1 Oct 2001 11:06:42 -0000	1.2.18.1
+++ squid/lib/Makefile.am	2 Oct 2001 22:34:33 -0000	1.2.18.2
@@ -8,7 +8,7 @@
 libmiscutil_a_SOURCES = rfc1123.c rfc1738.c rfc1035.c rfc2617.c util.c \
 	getfullhostname.c base64.c uudecode.c splay.c safe_inet_addr.c \
 	iso3307.c snprintf.c md5.c radix.c stub_memaccount.c Array.c \
-	Stack.c hash.c heap.c html_quote.c 
+	Stack.c hash.c heap.c html_quote.c MemPool.c
 libmiscutil_a_LIBADD = @LIBOBJS@
 # $(top_srcdir)/include/version.h should be a dependency
 libregex_a_SOURCES = GNUregex.c
Index: squid/src/Makefile.am
===================================================================
RCS file: /cvsroot/squid-sf//squid/src/Makefile.am,v
retrieving revision 1.5.4.1
retrieving revision 1.5.4.2
diff -u -r1.5.4.1 -r1.5.4.2
--- squid/src/Makefile.am	1 Oct 2001 11:06:42 -0000	1.5.4.1
+++ squid/src/Makefile.am	2 Oct 2001 22:34:33 -0000	1.5.4.2
@@ -153,7 +153,6 @@
 	logfile.c \
 	main.c \
 	mem.c \
-	MemPool.c \
 	MemBuf.c \
 	mime.c \
 	multicast.c \