X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmalloc.m4;h=25ab6e3124cec7085411adb78c685ceaf3388b68;hb=4360528b84a6126535eed6a168f5922645286544;hp=ec59397680fc28992716ce0b4e67c0d309e35c77;hpb=d8e38d07fe74b36bc8e29d0676cafec0d27e6e7f;p=gnulib.git

diff --git a/m4/malloc.m4 b/m4/malloc.m4
index ec5939768..25ab6e312 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,17 +1,17 @@
-#serial 1
+#serial 4
 
 dnl From Jim Meyering.
 dnl Determine whether malloc accepts 0 as its argument.
 dnl If it doesn't, arrange to use the replacement function.
 dnl
-dnl If you use this macro in a package, you should
-dnl add the following two lines to acconfig.h:
-dnl  /* Define to rpl_malloc if the replacement function should be used.  */
-dnl  #undef malloc
-dnl
 
 AC_DEFUN(jm_FUNC_MALLOC,
 [
+ dnl xmalloc.c requires that this symbol be defined so it doesn't
+ dnl mistakenly use a broken malloc -- as it might if this test were omitted.
+ AC_DEFINE_UNQUOTED(HAVE_DONE_WORKING_MALLOC_CHECK, 1,
+                    [Define if the malloc check has been performed. ])
+
  AC_CACHE_CHECK([for working malloc], jm_cv_func_working_malloc,
   [AC_TRY_RUN([
     char *malloc ();
@@ -27,7 +27,8 @@ AC_DEFUN(jm_FUNC_MALLOC,
 	 jm_cv_func_working_malloc=no)
   ])
   if test $jm_cv_func_working_malloc = no; then
-    LIBOBJS="$LIBOBJS malloc.o"
-    AC_DEFINE_UNQUOTED(malloc, rpl_malloc)
+    AC_LIBOBJ(malloc)
+    AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
+      [Define to rpl_malloc if the replacement function should be used.])
   fi
 ])