summaryrefslogtreecommitdiff
path: root/src/Makefile.in
diff options
context:
space:
mode:
authorRichard M. Stallman <rms@gnu.org>1997-04-09 04:01:31 +0000
committerRichard M. Stallman <rms@gnu.org>1997-04-09 04:01:31 +0000
commitb1377d7f09878ac8b39774535c8408f77fab244f (patch)
tree3e40fb5772bdec456ed52b0ce4a6b27fcbd72bb5 /src/Makefile.in
parent188b4aeaacfdd82fe6cdc5933d0612d814158703 (diff)
downloademacs-b1377d7f09878ac8b39774535c8408f77fab244f.tar.gz
(mallocobj): Don't add gmalloc if using glibc.
Drop check for `old malloc'; it isn't distributed with Emacs.
Diffstat (limited to 'src/Makefile.in')
-rw-r--r--src/Makefile.in12
1 files changed, 8 insertions, 4 deletions
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 */