From f27e3e37af0c33593d8a557eca13e5698099f107 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 6 May 2011 01:15:44 +0200 Subject: [PATCH] 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. --- ChangeLog | 9 +++++++++ m4/calloc.m4 | 12 +++--------- modules/calloc-gnu | 3 +++ modules/calloc-posix | 3 +++ 4 files changed, 18 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9d185f53dd..ff755c166e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2011-05-05 Bruno Haible + + 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 btowc: Move AC_LIBOBJ invocations to module description. diff --git a/m4/calloc.m4 b/m4/calloc.m4 index 8f462b356c..3bab70998c 100644 --- 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 734d9734b5..ffc8b50efd 100644 --- 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 f93b90e857..ef274ed490 100644 --- 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: -- 2.30.2