--- 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.

--- 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 @@
                [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_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
-])

--- a/modules/calloc-gnu
+++ b/modules/calloc-gnu
@@ -10,6 +10,9 @@
 
 configure.ac:
 gl_FUNC_CALLOC_GNU
+if test $REPLACE_CALLOC = 1; then
+  AC_LIBOBJ([calloc])
+fi
 gl_MODULE_INDICATOR([calloc-gnu])
 
 Makefile.am:

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