From: Richard M. Stallman <rms@gnu.org>
Date: Fri, 11 Apr 1997 08:24:41 +0000 (+0000)
Subject: (doug_lea_malloc):  First check for SYSTEM_MALLOC,
X-Git-Tag: emacs-20.1~2554
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=8cd880383cdcfdefdc82f5c3fb6224f52f53fa5b;p=emacs.git

(doug_lea_malloc):  First check for SYSTEM_MALLOC,
in case it is desirable to disable the GNU malloc features withglibc.
---

diff --git a/configure.in b/configure.in
index 0452c255271..381cb7128ce 100644
--- a/configure.in
+++ b/configure.in
@@ -1284,15 +1284,18 @@ GNU_MALLOC=yes
 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" = "yes" ; then
-  GNU_MALLOC_reason="
-    (Using new Doug Lea's new malloc from the GNU C Library.)"
-  AC_DEFINE(DOUG_LEA_MALLOC)
-elif test "${system_malloc}" = "yes"; then
+if test "${system_malloc}" = "yes"; then
   GNU_MALLOC=no
   GNU_MALLOC_reason="
     (The GNU allocators don't work with this system configuration.)"
 fi
+if test "$doug_lea_malloc" = "yes" ; then
+  if test "$GNU_MALLOC" = yes ; then
+    GNU_MALLOC_reason="
+      (Using new Doug Lea's new malloc from the GNU C Library.)"
+  fi
+  AC_DEFINE(DOUG_LEA_MALLOC)
+fi
 
 if test x"${REL_ALLOC}" = x; then
   REL_ALLOC=${GNU_MALLOC}