From 0447803a9a2d924f6dd0c4d0042256f065332b4e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 14:46:30 +0200 Subject: [PATCH] memchr: Respect rules for use of AC_LIBOBJ. * m4/memchr.m4 (gl_FUNC_MEMCHR): Move AC_LIBOBJ and gl_PREREQ_MEMCHR invocations from here... * modules/memchr (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/memchr.m4 | 6 +----- modules/memchr | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index af0d43ea8..c7398b514 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-21 Bruno Haible + memchr: Respect rules for use of AC_LIBOBJ. + * m4/memchr.m4 (gl_FUNC_MEMCHR): Move AC_LIBOBJ and gl_PREREQ_MEMCHR + invocations from here... + * modules/memchr (configure.ac): ... to here. + +2011-05-21 Bruno Haible + mbtowc: Move AC_LIBOBJ invocations to module description. * m4/mbtowc.m4 (gl_FUNC_MBTOWC): Move AC_LIBOBJ and gl_PREREQ_MBTOWC invocations from here... diff --git a/m4/memchr.m4 b/m4/memchr.m4 index a544e2b4e..f6dc3e712 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,4 +1,4 @@ -# memchr.m4 serial 11 +# memchr.m4 serial 12 dnl Copyright (C) 2002-2004, 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, @@ -80,10 +80,6 @@ AC_DEFUN_ONCE([gl_FUNC_MEMCHR], REPLACE_MEMCHR=1 fi fi - if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then - AC_LIBOBJ([memchr]) - gl_PREREQ_MEMCHR - fi ]) # Prerequisites of lib/memchr.c. diff --git a/modules/memchr b/modules/memchr index 229b3a5bf..ed80e0c2d 100644 --- a/modules/memchr +++ b/modules/memchr @@ -14,6 +14,10 @@ memchr-obsolete configure.ac: gl_FUNC_MEMCHR +if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then + AC_LIBOBJ([memchr]) + gl_PREREQ_MEMCHR +fi gl_STRING_MODULE_INDICATOR([memchr]) Makefile.am: -- 2.11.0