From a5a4dc82a454310d209f6ed24322bed2eaebb599 Mon Sep 17 00:00:00 2001
From: hno <>
Date: Mon, 27 Aug 2007 15:43:44 +0000
Subject: [PATCH] Remove remaining traces of dlmalloc

---
 CREDITS         | 12 +-----------
 configure.in    |  8 ++------
 lib/Makefile.am |  5 +----
 3 files changed, 4 insertions(+), 21 deletions(-)

diff --git a/CREDITS b/CREDITS
index 828229f833..23608903f7 100644
--- a/CREDITS
+++ b/CREDITS
@@ -1,4 +1,4 @@
-$Id: CREDITS,v 1.9 2003/01/23 00:34:50 robertc Exp $
+$Id: CREDITS,v 1.10 2007/08/27 09:43:44 hno Exp $
 
 ==============================================================================
 
@@ -154,16 +154,6 @@ lib/GNUregex.c:
 
 ==============================================================================
 
-lib/dlmalloc.c:
-
-A version of malloc/free/realloc written by Doug Lea and released to the 
-public domain.  Send questions/comments/complaints/performance data
-to dl@cs.oswego.edu.
-
-http://g.oswego.edu/dl/html/malloc.html
-
-==============================================================================
-
 lib/md5.c:
 
 /*
diff --git a/configure.in b/configure.in
index 6e0dc74fcb..9e7f0bc458 100644
--- a/configure.in
+++ b/configure.in
@@ -1,7 +1,7 @@
 
 dnl  Configuration input file for Squid
 dnl
-dnl  $Id: configure.in,v 1.467 2007/08/26 21:04:30 hno Exp $
+dnl  $Id: configure.in,v 1.468 2007/08/27 09:43:44 hno Exp $
 dnl
 dnl
 dnl
@@ -11,7 +11,7 @@ AM_CONFIG_HEADER(include/autoconf.h)
 AC_CONFIG_AUX_DIR(cfgaux)
 AC_CONFIG_SRCDIR([src/main.cc])
 AM_INIT_AUTOMAKE([tar-ustar])
-AC_REVISION($Revision: 1.467 $)dnl
+AC_REVISION($Revision: 1.468 $)dnl
 AC_PREFIX_DEFAULT(/usr/local/squid)
 AM_MAINTAINER_MODE
 
@@ -2231,9 +2231,6 @@ if test x"$squid_cv_unixsocket" = x"yes"; then
 fi
 dnl end rip
 
-if test "x$ac_cv_enabled_dlmalloc" = "xyes" ; then
-  echo "skipping libmalloc check (--enable-dlmalloc specified)"
-else
   AC_CHECK_LIB(gnumalloc, main)
   if test "$ac_cv_lib_gnumalloc_main" = "yes"; then
 		echo "Disabling extended malloc functions when using gnumalloc"
@@ -2254,7 +2251,6 @@ else
 				;;
 		esac
   fi
-fi
 
 AC_CHECK_LIB(bsd, main)
 AC_CHECK_LIB(regex, main, [REGEXLIB="-lregex"])
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9b8084be57..418d8fdda7 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 #
-#  $Id: Makefile.am,v 1.26 2007/08/17 18:56:25 serassio Exp $
+#  $Id: Makefile.am,v 1.27 2007/08/27 09:43:45 hno Exp $
 #
 
 DIST_SUBDIRS = libTrie
@@ -48,7 +48,6 @@ WIN32SRC=
 endif
 
 EXTRA_LIBRARIES = \
-	libdlmalloc.a \
 	libregex.a \
 	libsspwin32.a
 noinst_LIBRARIES = \
@@ -97,8 +96,6 @@ libmiscutil_a_LIBADD = \
 # $(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 = \
-- 
2.39.5