From c0c0912c1e63c75b7fbe8c9b3522edf0519d162f Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 May 2011 18:35:00 +0200 Subject: [PATCH] wcsrtombs: Move AC_LIBOBJ invocations to module description. * m4/wcsrtombs.m4 (gl_FUNC_WCSRTOMBS): Move AC_LIBOBJ and gl_PREREQ_WCSRTOMBS invocations from here... * modules/wcsrtombs (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/wcsrtombs.m4 | 7 +------ modules/wcsrtombs | 5 +++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8b306c4d5..1f4f3216f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-22 Bruno Haible + wcsrtombs: Move AC_LIBOBJ invocations to module description. + * m4/wcsrtombs.m4 (gl_FUNC_WCSRTOMBS): Move AC_LIBOBJ and + gl_PREREQ_WCSRTOMBS invocations from here... + * modules/wcsrtombs (configure.ac): ... to here. + +2011-05-22 Bruno Haible + wcsrchr: Move AC_LIBOBJ invocations to module description. * m4/wcsrchr.m4 (gl_FUNC_WCSRCHR): Move AC_LIBOBJ invocation from here... diff --git a/m4/wcsrtombs.m4 b/m4/wcsrtombs.m4 index cd51506a2..7ce575961 100644 --- a/m4/wcsrtombs.m4 +++ b/m4/wcsrtombs.m4 @@ -1,4 +1,4 @@ -# wcsrtombs.m4 serial 9 +# wcsrtombs.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, @@ -34,11 +34,6 @@ AC_DEFUN([gl_FUNC_WCSRTOMBS], esac fi fi - if test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1; then - AC_LIBOBJ([wcsrtombs]) - AC_LIBOBJ([wcsrtombs-state]) - gl_PREREQ_WCSRTOMBS - fi ]) dnl Test whether the wcsrtombs implementation stores a non-NULL source pointer diff --git a/modules/wcsrtombs b/modules/wcsrtombs index 49c050395..b61ac34f7 100644 --- a/modules/wcsrtombs +++ b/modules/wcsrtombs @@ -20,6 +20,11 @@ wcrtomb [test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1] configure.ac: gl_FUNC_WCSRTOMBS +if test $HAVE_WCSRTOMBS = 0 || test $REPLACE_WCSRTOMBS = 1; then + AC_LIBOBJ([wcsrtombs]) + AC_LIBOBJ([wcsrtombs-state]) + gl_PREREQ_WCSRTOMBS +fi gl_WCHAR_MODULE_INDICATOR([wcsrtombs]) Makefile.am: -- 2.11.0