From: Bruno Haible Date: Sat, 21 May 2011 12:17:23 +0000 (+0200) Subject: mbrlen: Move AC_LIBOBJ invocations to module description. X-Git-Tag: v0.1~2496 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=18de46ba5f451481bf90d139e6ac648c40d97d17;p=gnulib.git mbrlen: Move AC_LIBOBJ invocations to module description. * m4/mbrlen.m4 (gl_FUNC_MBRLEN): Move AC_LIBOBJ and gl_PREREQ_MBRLEN invocations from here... * modules/mbrlen (configure.ac): ... to here. --- diff --git a/ChangeLog b/ChangeLog index 791f4a49e..60ce43d19 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-21 Bruno Haible + mbrlen: Move AC_LIBOBJ invocations to module description. + * m4/mbrlen.m4 (gl_FUNC_MBRLEN): Move AC_LIBOBJ and gl_PREREQ_MBRLEN + invocations from here... + * modules/mbrlen (configure.ac): ... to here. + +2011-05-21 Bruno Haible + mbrtowc: Respect rules for use of AC_LIBOBJ. * m4/mbrtowc.m4 (gl_FUNC_MBRTOWC): Move AC_LIBOBJ and gl_PREREQ_MBRTOWC invocations from here... diff --git a/m4/mbrlen.m4 b/m4/mbrlen.m4 index 8f55e3627..884f8cdb4 100644 --- a/m4/mbrlen.m4 +++ b/m4/mbrlen.m4 @@ -1,4 +1,4 @@ -# mbrlen.m4 serial 6 +# mbrlen.m4 serial 7 dnl Copyright (C) 2008, 2010-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, @@ -22,10 +22,6 @@ AC_DEFUN([gl_FUNC_MBRLEN], REPLACE_MBRLEN=1 fi fi - if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then - AC_LIBOBJ([mbrlen]) - gl_PREREQ_MBRLEN - fi ]) dnl Test whether mbrlen puts the state into non-initial state when parsing an diff --git a/modules/mbrlen b/modules/mbrlen index 5bc9f297c..2c589e9b2 100644 --- a/modules/mbrlen +++ b/modules/mbrlen @@ -13,6 +13,10 @@ mbrtowc [test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1] configure.ac: gl_FUNC_MBRLEN +if test $HAVE_MBRLEN = 0 || test $REPLACE_MBRLEN = 1; then + AC_LIBOBJ([mbrlen]) + gl_PREREQ_MBRLEN +fi gl_WCHAR_MODULE_INDICATOR([mbrlen]) Makefile.am: