realloc-*: Move AC_LIBOBJ invocations to module description.

* m4/realloc.m4 (gl_REPLACE_REALLOC): Remove macro.
(gl_FUNC_REALLOC_GNU, gl_FUNC_REALLOC_POSIX): Inline it here. Move
AC_LIBOBJ invocations from here...
* modules/realloc-gnu (configure.ac): ... to here.
* modules/realloc-posix (configure.ac): ... and here.

diff --git a/ChangeLog b/ChangeLog
index b894ce1b43731ddfb82644bdc58f878be1536951..d9d2715fb27ad40b5cc365ec799f0d95dd2e5ce4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-21  Bruno Haible  <bruno@clisp.org>
+
+       realloc-*: Move AC_LIBOBJ invocations to module description.
+       * m4/realloc.m4 (gl_REPLACE_REALLOC): Remove macro.
+       (gl_FUNC_REALLOC_GNU, gl_FUNC_REALLOC_POSIX): Inline it here. Move
+       AC_LIBOBJ invocations from here...
+       * modules/realloc-gnu (configure.ac): ... to here.
+       * modules/realloc-posix (configure.ac): ... and here.
+
 2011-05-21  Bruno Haible  <bruno@clisp.org>
 
        readutmp: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/realloc.m4 b/m4/realloc.m4
index a403d9fb3294eef67f56317b81730f999f34a23b..5cc1340d13a73856002f675ea57b9b1da4f8e43c 100644 (file)
--- a/m4/realloc.m4
+++ b/m4/realloc.m4
@@ -1,4 +1,4 @@
-# realloc.m4 serial 11
+# realloc.m4 serial 12
 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_REALLOC_GNU],
                [Define to 1 if your system has a GNU libc compatible 'realloc'
                 function, and to 0 otherwise.])],
     [AC_DEFINE([HAVE_REALLOC_GNU], [0])
-     gl_REPLACE_REALLOC
+     REPLACE_REALLOC=1
     ])
 ])# gl_FUNC_REALLOC_GNU
 
@@ -33,12 +33,6 @@ AC_DEFUN([gl_FUNC_REALLOC_POSIX],
     AC_DEFINE([HAVE_REALLOC_POSIX], [1],
       [Define if the 'realloc' function is POSIX compliant.])
   else
-    gl_REPLACE_REALLOC
+    REPLACE_REALLOC=1
   fi
 ])
-
-AC_DEFUN([gl_REPLACE_REALLOC],
-[
-  AC_LIBOBJ([realloc])
-  REPLACE_REALLOC=1
-])

diff --git a/modules/realloc-gnu b/modules/realloc-gnu
index f0599763469a0d11cc02f76af620c488db194b27..760edcda1a884407f65695b0b2622789caba52b2 100644 (file)
--- a/modules/realloc-gnu
+++ b/modules/realloc-gnu
@@ -14,6 +14,9 @@ realloc-posix
 
 configure.ac:
 gl_FUNC_REALLOC_GNU
+if test $REPLACE_REALLOC = 1; then
+  AC_LIBOBJ([realloc])
+fi
 gl_MODULE_INDICATOR([realloc-gnu])
 
 Makefile.am:

diff --git a/modules/realloc-posix b/modules/realloc-posix
index 5876584eeae7e73e684d9b4bee82b6955e1a0b7b..20270e619b7824fc58a42167b3a2ab745c551d67 100644 (file)
--- a/modules/realloc-posix
+++ b/modules/realloc-posix
@@ -11,6 +11,9 @@ stdlib
 
 configure.ac:
 gl_FUNC_REALLOC_POSIX
+if test $REPLACE_REALLOC = 1; then
+  AC_LIBOBJ([realloc])
+fi
 gl_STDLIB_MODULE_INDICATOR([realloc-posix])
 
 Makefile.am: