From d4224ac60671bcbdd6ab1f8b8bbd12ae10625ab7 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 May 2011 18:05:23 +0200 Subject: [PATCH] wcrtomb: Move AC_LIBOBJ invocations to module description. * m4/wcrtomb.m4 (gl_FUNC_WCRTOMB): Move AC_LIBOBJ and gl_PREREQ_WCRTOMB invocations from here... * modules/wcrtomb (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/wcrtomb.m4 | 6 +----- modules/wcrtomb | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 948be57c3..b8b2a5d60 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-22 Bruno Haible + wcrtomb: Move AC_LIBOBJ invocations to module description. + * m4/wcrtomb.m4 (gl_FUNC_WCRTOMB): Move AC_LIBOBJ and gl_PREREQ_WCRTOMB + invocations from here... + * modules/wcrtomb (configure.ac): ... to here. + +2011-05-22 Bruno Haible + wcpncpy: Move AC_LIBOBJ invocations to module description. * m4/wcpncpy.m4 (gl_FUNC_WCPNCPY): Move AC_LIBOBJ invocation from here... diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index 4f58e3f5d..d21f1b9a7 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,4 +1,4 @@ -# wcrtomb.m4 serial 9 +# wcrtomb.m4 serial 10 dnl Copyright (C) 2008-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, @@ -88,10 +88,6 @@ int main () esac fi fi - if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then - AC_LIBOBJ([wcrtomb]) - gl_PREREQ_WCRTOMB - fi ]) # Prerequisites of lib/wcrtomb.c. diff --git a/modules/wcrtomb b/modules/wcrtomb index f9fea15ff..184fc5312 100644 --- a/modules/wcrtomb +++ b/modules/wcrtomb @@ -18,6 +18,10 @@ mbsinit [test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1] configure.ac: gl_FUNC_WCRTOMB +if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then + AC_LIBOBJ([wcrtomb]) + gl_PREREQ_WCRTOMB +fi gl_WCHAR_MODULE_INDICATOR([wcrtomb]) Makefile.am: -- 2.11.0