malloc-*: Move AC_LIBOBJ invocations to module description.

* m4/malloc.m4 (gl_REPLACE_MALLOC): Remove macro.
(gl_FUNC_MALLOC_GNU, gl_FUNC_MALLOC_POSIX): Inline it here. Move
AC_LIBOBJ invocations from here...
* modules/malloc-gnu (configure.ac): ... to here.
* modules/malloc-posix (configure.ac): ... and here.

diff --git a/ChangeLog b/ChangeLog
index f5a3d8a..11a1b8b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
+       malloc-*: Move AC_LIBOBJ invocations to module description.
+       * m4/malloc.m4 (gl_REPLACE_MALLOC): Remove macro.
+       (gl_FUNC_MALLOC_GNU, gl_FUNC_MALLOC_POSIX): Inline it here. Move
+       AC_LIBOBJ invocations from here...
+       * modules/malloc-gnu (configure.ac): ... to here.
+       * modules/malloc-posix (configure.ac): ... and here.
+
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
        lstat, openat: Respect rules for use of AC_LIBOBJ.
        * m4/lstat.m4 (gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK): Renamed from
        AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK. Set variable

diff --git a/m4/malloc.m4 b/m4/malloc.m4
index 8094444..87018ec 100644 (file)
--- a/m4/malloc.m4
+++ b/m4/malloc.m4
@@ -1,4 +1,4 @@
-# malloc.m4 serial 12
+# malloc.m4 serial 13
 dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -17,7 +17,7 @@ AC_DEFUN([gl_FUNC_MALLOC_GNU],
                [Define to 1 if your system has a GNU libc compatible 'malloc'
                 function, and to 0 otherwise.])],
     [AC_DEFINE([HAVE_MALLOC_GNU], [0])
-     gl_REPLACE_MALLOC
+     REPLACE_MALLOC=1
     ])
 ])
 
@@ -33,7 +33,7 @@ AC_DEFUN([gl_FUNC_MALLOC_POSIX],
     AC_DEFINE([HAVE_MALLOC_POSIX], [1],
       [Define if the 'malloc' function is POSIX compliant.])
   else
-    gl_REPLACE_MALLOC
+    REPLACE_MALLOC=1
   fi
 ])
 
@@ -58,9 +58,3 @@ AC_DEFUN([gl_CHECK_MALLOC_POSIX],
         [gl_cv_func_malloc_posix=no])
     ])
 ])
-
-AC_DEFUN([gl_REPLACE_MALLOC],
-[
-  AC_LIBOBJ([malloc])
-  REPLACE_MALLOC=1
-])

diff --git a/modules/malloc-gnu b/modules/malloc-gnu
index 7cb21b8..0bfa92d 100644 (file)
--- a/modules/malloc-gnu
+++ b/modules/malloc-gnu
@@ -14,6 +14,9 @@ malloc-posix
 
 configure.ac:
 gl_FUNC_MALLOC_GNU
+if test $REPLACE_MALLOC = 1; then
+  AC_LIBOBJ([malloc])
+fi
 gl_MODULE_INDICATOR([malloc-gnu])
 
 Makefile.am:

diff --git a/modules/malloc-posix b/modules/malloc-posix
index 0b0edd6..b4b0bc0 100644 (file)
--- a/modules/malloc-posix
+++ b/modules/malloc-posix
@@ -10,6 +10,9 @@ stdlib
 
 configure.ac:
 gl_FUNC_MALLOC_POSIX
+if test $REPLACE_MALLOC = 1; then
+  AC_LIBOBJ([malloc])
+fi
 gl_STDLIB_MODULE_INDICATOR([malloc-posix])
 
 Makefile.am: