calloc-posix, calloc-gnu: Move AC_LIBOBJs to module description.

* m4/calloc.m4 (gl_REPLACE_CALLOC): Remove macro.
(gl_FUNC_CALLOC_GNU, gl_FUNC_CALLOC_POSIX): Instead, just set
REPLACE_CALLOC.
* modules/calloc-posix (configure.ac): Invoke AC_LIBOBJ here.
* modules/calloc-gnu (configure.ac): Likewise.

diff --git a/ChangeLog b/ChangeLog
index 9d185f53dd575f81b07f5d7eab1864a5f7227671..ff755c166e9d0eb03192efbc3ece71657079faf8 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2011-05-05  Bruno Haible  <bruno@clisp.org>
+
+       calloc-posix, calloc-gnu: Move AC_LIBOBJs to module description.
+       * m4/calloc.m4 (gl_REPLACE_CALLOC): Remove macro.
+       (gl_FUNC_CALLOC_GNU, gl_FUNC_CALLOC_POSIX): Instead, just set
+       REPLACE_CALLOC.
+       * modules/calloc-posix (configure.ac): Invoke AC_LIBOBJ here.
+       * modules/calloc-gnu (configure.ac): Likewise.
+
 2011-05-05  Bruno Haible  <bruno@clisp.org>
 
        btowc: Move AC_LIBOBJ invocations to module description.

diff --git a/m4/calloc.m4 b/m4/calloc.m4
index 8f462b356ca527d97a35b3721e6b39307c0cf57b..3bab70998c1b5ef51db207ddc67837d790e84fc7 100644 (file)
--- a/m4/calloc.m4
+++ b/m4/calloc.m4
@@ -1,4 +1,4 @@
-# calloc.m4 serial 12
+# calloc.m4 serial 13
 
 # Copyright (C) 2004-2011 Free Software Foundation, Inc.
 # This file is free software; the Free Software Foundation
@@ -49,7 +49,7 @@ AC_DEFUN([gl_FUNC_CALLOC_GNU],
                [Define to 1 if your system has a GNU libc compatible `calloc'
                 function, and to 0 otherwise.])],
     [AC_DEFINE([HAVE_CALLOC_GNU], [0])
-     gl_REPLACE_CALLOC
+     REPLACE_CALLOC=1
     ])
 ])# gl_FUNC_CALLOC_GNU
 
@@ -66,12 +66,6 @@ AC_DEFUN([gl_FUNC_CALLOC_POSIX],
     AC_DEFINE([HAVE_CALLOC_POSIX], [1],
       [Define if the 'calloc' function is POSIX compliant.])
   else
-    gl_REPLACE_CALLOC
+    REPLACE_CALLOC=1
   fi
 ])
-
-AC_DEFUN([gl_REPLACE_CALLOC],
-[
-  AC_LIBOBJ([calloc])
-  REPLACE_CALLOC=1
-])

diff --git a/modules/calloc-gnu b/modules/calloc-gnu
index 734d9734b5610fe6962c887e5b34d154e98c2250..ffc8b50efd221b92752d480e3d68a544de5f274e 100644 (file)
--- a/modules/calloc-gnu
+++ b/modules/calloc-gnu
@@ -10,6 +10,9 @@ calloc-posix
 
 configure.ac:
 gl_FUNC_CALLOC_GNU
+if test $REPLACE_CALLOC = 1; then
+  AC_LIBOBJ([calloc])
+fi
 gl_MODULE_INDICATOR([calloc-gnu])
 
 Makefile.am:

diff --git a/modules/calloc-posix b/modules/calloc-posix
index f93b90e857bc322b9dec17234696505f52f72a2a..ef274ed490e60aaea03ffa6052dabfe21f5c053a 100644 (file)
--- a/modules/calloc-posix
+++ b/modules/calloc-posix
@@ -11,6 +11,9 @@ stdlib
 
 configure.ac:
 gl_FUNC_CALLOC_POSIX
+if test $REPLACE_CALLOC = 1; then
+  AC_LIBOBJ([calloc])
+fi
 gl_STDLIB_MODULE_INDICATOR([calloc-posix])
 
 Makefile.am: