[sawfish] removed our own dlmalloc

[Christopher Bratusek <chrisb src gnome org>]

commit 6fb27f6485302ea4032701abca6f1ef002556a7d
Author: Christopher Roy Bratusek <chris nanolx org>
Date:   Tue Dec 29 16:10:13 2009 +0100

    removed our own dlmalloc

 ChangeLog      |    5 +
 config.h.in    |    6 -
 configure.in   |   14 -
 man/news.texi  |    3 +
 src/dlmalloc.c | 3157 --------------------------------------------------------
 5 files changed, 8 insertions(+), 3177 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 984d5c7..c14862c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -7,6 +7,11 @@
 
 	* man/news.texi: updated
 
+	* configure.in
+	* config.h.in
+	* src/dlmalloc.c: removed our own dlmalloc, as it breaks too many arches,
+	                  and is therefore never in use since several years [Kim B. Heino]
+
 2009-12-28  Christopher Bratusek <zanghar freenet de>
 	* configure.in: use `kde4-config --install data' instead of `kde4-config --path data' [Kim B. Heino]
 
diff --git a/config.h.in b/config.h.in
index cdf1df3..7933ef0 100644
--- a/config.h.in
+++ b/config.h.in
@@ -11,9 +11,6 @@
 /* Define to 1 if using `alloca.c'. */
 #undef C_ALLOCA
 
-/* Doug Lea malloc */
-#undef DOUG_LEA_MALLOC
-
 /* Define to 1 if you have `alloca', as a function or macro. */
 #undef HAVE_ALLOCA
 
@@ -126,9 +123,6 @@
 /* Have xft */
 #undef HAVE_X11_XFT_XFT_H
 
-/* libc malloc */
-#undef LIBC_MALLOC
-
 /* Need pixmap cache */
 #undef NEED_PIXMAP_CACHE
 
diff --git a/configure.in b/configure.in
index 985a1d2..e49bf50 100644
--- a/configure.in
+++ b/configure.in
@@ -284,20 +284,6 @@ if test "$with_nls" = "yes"; then
 	SUBDIRS="${SUBDIRS} po"
 fi
 
-dnl Check for Doug Lea's malloc in libc
-doug_lea_malloc=yes
-AC_CHECK_FUNC(malloc_get_state, , doug_lea_malloc=no)
-AC_CHECK_FUNC(malloc_set_state, , doug_lea_malloc=no)
-if test "$doug_lea_malloc" = "no"; then
-  dnl We used to compile our own version of dlmalloc on most
-  dnl platforms that didn't have it in their libc. But the list
-  dnl of exceptions was growing too long..
-  AC_DEFINE(LIBC_MALLOC,1,[libc malloc])
-else
-  AC_DEFINE(DOUG_LEA_MALLOC,1,[Doug Lea malloc])
-  AC_DEFINE(LIBC_MALLOC,1,[libc malloc])
-fi
-
 dnl Check for GNOME location
 AC_ARG_WITH(gnome_prefix,
  [  --with-gnome-prefix=DIR Root of GNOME installation], [],
diff --git a/man/news.texi b/man/news.texi
index 4899865..ecb2066 100644
--- a/man/news.texi
+++ b/man/news.texi
@@ -34,6 +34,9 @@ Make $datadir/kde4/apps/ the fallback path, if KDE4 is not installed
 instead of hardcoding those paths from configure, which makes it more portable.
 [Kim B. Heino]
 
+ item Our own implementation of dlmalloc is disabled since 2002, as it breaks
+sawfish on several architectures. From this version on, we don't ship it.
+[Kim B. Heino]
 @end itemize
 @item Doc
 @itemize @minus