From 1d9d77a8330f48513aa7bc819d35f24aa18edc53 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 6 May 2011 01:09:53 +0200 Subject: [PATCH] btowc: Move AC_LIBOBJ invocations to module description. * m4/btowc.m4 (gl_FUNC_BTOWC): Move AC_LIBOBJ and gl_PREREQ_BTOWC invocations from here... * modules/btowc (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/btowc.m4 | 6 +----- modules/btowc | 4 ++++ 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f030e93a00..9d185f53dd 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-05-05 Bruno Haible + + btowc: Move AC_LIBOBJ invocations to module description. + * m4/btowc.m4 (gl_FUNC_BTOWC): Move AC_LIBOBJ and gl_PREREQ_BTOWC + invocations from here... + * modules/btowc (configure.ac): ... to here. + 2011-05-21 Bruno Haible atexit: Move AC_LIBOBJ invocations to module description. diff --git a/m4/btowc.m4 b/m4/btowc.m4 index 32bf0cfca0..2b845e7ceb 100644 --- a/m4/btowc.m4 +++ b/m4/btowc.m4 @@ -1,4 +1,4 @@ -# btowc.m4 serial 9 +# btowc.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, @@ -108,10 +108,6 @@ int main () *) REPLACE_BTOWC=1 ;; esac fi - if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then - AC_LIBOBJ([btowc]) - gl_PREREQ_BTOWC - fi ]) # Prerequisites of lib/btowc.c. diff --git a/modules/btowc b/modules/btowc index 1566a2fa71..b9572a6375 100644 --- a/modules/btowc +++ b/modules/btowc @@ -12,6 +12,10 @@ mbtowc [test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1] configure.ac: gl_FUNC_BTOWC +if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then + AC_LIBOBJ([btowc]) + gl_PREREQ_BTOWC +fi gl_WCHAR_MODULE_INDICATOR([btowc]) Makefile.am: -- 2.30.2