From fc35df56c77fa878fb118c1975e58a4848247953 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 May 2011 18:30:35 +0200 Subject: [PATCH] wcsnrtombs: Move AC_LIBOBJ invocations to module description. * m4/wcsnrtombs.m4 (gl_FUNC_WCSNRTOMBS): Move AC_LIBOBJ and gl_PREREQ_WCSNRTOMBS invocations from here... * modules/wcsnrtombs (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/wcsnrtombs.m4 | 7 +------ modules/wcsnrtombs | 5 +++++ 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index f1c35cda9..be4216fc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,12 @@ 2011-05-22 Bruno Haible + wcsnrtombs: Move AC_LIBOBJ invocations to module description. + * m4/wcsnrtombs.m4 (gl_FUNC_WCSNRTOMBS): Move AC_LIBOBJ and + gl_PREREQ_WCSNRTOMBS invocations from here... + * modules/wcsnrtombs (configure.ac): ... to here. + +2011-05-22 Bruno Haible + wcsnlen: Move AC_LIBOBJ invocations to module description. * m4/wcsnlen.m4 (gl_FUNC_WCSNLEN): Move AC_LIBOBJ invocation from here... diff --git a/m4/wcsnrtombs.m4 b/m4/wcsnrtombs.m4 index ba61129a5..d1fac8ca8 100644 --- a/m4/wcsnrtombs.m4 +++ b/m4/wcsnrtombs.m4 @@ -1,4 +1,4 @@ -# wcsnrtombs.m4 serial 4 +# wcsnrtombs.m4 serial 5 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, @@ -19,11 +19,6 @@ AC_DEFUN([gl_FUNC_WCSNRTOMBS], REPLACE_WCSNRTOMBS=1 fi fi - if test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1; then - AC_LIBOBJ([wcsnrtombs]) - AC_LIBOBJ([wcsrtombs-state]) - gl_PREREQ_WCSNRTOMBS - fi ]) # Prerequisites of lib/wcsnrtombs.c. diff --git a/modules/wcsnrtombs b/modules/wcsnrtombs index 3582ae57f..63103f4ac 100644 --- a/modules/wcsnrtombs +++ b/modules/wcsnrtombs @@ -19,6 +19,11 @@ wcrtomb [test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1] configure.ac: gl_FUNC_WCSNRTOMBS +if test $HAVE_WCSNRTOMBS = 0 || test $REPLACE_WCSNRTOMBS = 1; then + AC_LIBOBJ([wcsnrtombs]) + AC_LIBOBJ([wcsrtombs-state]) + gl_PREREQ_WCSNRTOMBS +fi gl_WCHAR_MODULE_INDICATOR([wcsnrtombs]) Makefile.am: -- 2.11.0