X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fmalloc.m4;h=cb5cff3c243aca182dfa6b66a1a5c47e0a8eeb8b;hb=cdb16e449503bbdc0cb239ebae9372227c250dfd;hp=85d62efa82b8f31595213d97f8021be277216fc8;hpb=6273d0115200a9a4ae9a9e2d71a677c911609562;p=gnulib.git

diff --git a/m4/malloc.m4 b/m4/malloc.m4
index 85d62efa8..cb5cff3c2 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,23 +1,19 @@
-#serial 2
+#serial 6
 
 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,
+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_DEFINE(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_CACHE_CHECK([whether malloc(0) returns a non-NULL pointer],
+                jm_cv_func_working_malloc,
   [AC_TRY_RUN([
     char *malloc ();
     int
@@ -28,11 +24,12 @@ AC_DEFUN(jm_FUNC_MALLOC,
 	  ],
 	 jm_cv_func_working_malloc=yes,
 	 jm_cv_func_working_malloc=no,
-	 dnl When crosscompiling, assume malloc is broken.
+	 dnl When crosscompiling, assume malloc(0) returns NULL.
 	 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(malloc, rpl_malloc,
+      [Define to rpl_malloc if the replacement function should be used.])
   fi
 ])