From ad2c4b8339db7e2734f0504d5157bb31129f728c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sat, 21 May 2011 14:24:51 +0200 Subject: [PATCH] mbsrtowcs: Move AC_LIBOBJ invocations to module description. * m4/mbsrtowcs.m4 (gl_FUNC_MBSRTOWCS): Move AC_LIBOBJ and gl_PREREQ_MBSRTOWCS invocations from here... * modules/mbsrtowcs (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/mbsrtowcs.m4 | 7 +------ modules/mbsrtowcs | 5 +++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 7a26c22b4..b017548c5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-21 Bruno Haible + mbsrtowcs: Move AC_LIBOBJ invocations to module description. + * m4/mbsrtowcs.m4 (gl_FUNC_MBSRTOWCS): Move AC_LIBOBJ and + gl_PREREQ_MBSRTOWCS invocations from here... + * modules/mbsrtowcs (configure.ac): ... to here. + +2011-05-21 Bruno Haible + mbsnrtowcs: Move AC_LIBOBJ invocations to module description. * m4/mbsnrtowcs.m4 (gl_FUNC_MBSNRTOWCS): Move AC_LIBOBJ and gl_PREREQ_MBSNRTOWCS invocations from here... diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4 index 4410741d7..025198a91 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,4 +1,4 @@ -# mbsrtowcs.m4 serial 11 +# mbsrtowcs.m4 serial 12 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, @@ -25,11 +25,6 @@ AC_DEFUN([gl_FUNC_MBSRTOWCS], esac fi fi - if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then - AC_LIBOBJ([mbsrtowcs]) - AC_LIBOBJ([mbsrtowcs-state]) - gl_PREREQ_MBSRTOWCS - fi ]) dnl Test whether mbsrtowcs works. diff --git a/modules/mbsrtowcs b/modules/mbsrtowcs index 66dd78f67..da5f016e4 100644 --- a/modules/mbsrtowcs +++ b/modules/mbsrtowcs @@ -20,6 +20,11 @@ strnlen1 [test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1] configure.ac: gl_FUNC_MBSRTOWCS +if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then + AC_LIBOBJ([mbsrtowcs]) + AC_LIBOBJ([mbsrtowcs-state]) + gl_PREREQ_MBSRTOWCS +fi gl_WCHAR_MODULE_INDICATOR([mbsrtowcs]) Makefile.am: -- 2.11.0