From: Richard M. Stallman <rms@gnu.org>
Date: Wed, 9 Apr 1997 04:01:31 +0000 (+0000)
Subject: (mallocobj): Don't add gmalloc if using glibc.
X-Git-Tag: emacs-20.1~2596
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=b1377d7f09878ac8b39774535c8408f77fab244f;p=emacs.git

(mallocobj): Don't add gmalloc if using glibc.
Drop check for `old malloc'; it isn't distributed with Emacs.
---

diff --git a/src/Makefile.in b/src/Makefile.in
index 53857331a8b..a6e7842b55f 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -536,15 +536,19 @@ termcapobj = tparam.o
 
 #ifndef SYSTEM_MALLOC
 
-#ifdef GNU_MALLOC  /* New GNU malloc */
+#ifdef DOUG_LEA_MALLOC
+#ifdef REL_ALLOC
+mallocobj = ralloc.o vm-limit.o
+#else /* ! defined (REL_ALLOC) */
+mallocobj = 
+#endif /* ! defined (REL_ALLOC) */
+#else /* ! defined (DOUG_LEA_MALLOC) */
 #ifdef REL_ALLOC
 mallocobj = gmalloc.o ralloc.o vm-limit.o
 #else /* ! defined (REL_ALLOC) */
 mallocobj = gmalloc.o vm-limit.o
 #endif /* ! defined (REL_ALLOC) */
-#else /* Old GNU malloc */
-mallocobj = malloc.o
-#endif /* Old GNU malloc */
+#endif /* ! defined (DOUG_LEA_MALLOC) */
 
 #endif /* SYSTEM_MALLOC */