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

diff --git a/m4/malloc.m4 b/m4/malloc.m4
index 85d62efa8..4978eaf6b 100644
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,14 +1,9 @@
-#serial 2
+#serial 3
 
 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,
 [
@@ -32,7 +27,9 @@ 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_SUBST(LIBOBJS)
+    LIBOBJS="$LIBOBJS malloc.$ac_objext"
+    AC_DEFINE_UNQUOTED(malloc, rpl_malloc,
+      [Define to rpl_malloc if the replacement function should be used.])
   fi
 ])