From 2d8eeb44be60fc4152280a32bc884894b5ad384c Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 22 May 2011 18:51:09 +0200 Subject: [PATCH] wctrans: Move AC_LIBOBJ invocations to module description. * m4/wctrans.m4 (gl_FUNC_WCTRANS): Set HAVE_WCTRANS. Move AC_LIBOBJ invocation from here... * modules/wctrans (configure.ac): ... to here. --- ChangeLog | 7 +++++++ m4/wctrans.m4 | 6 ++---- modules/wctrans | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index d4590aca68..1cd2c4e092 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2011-05-22 Bruno Haible + + wctrans: Move AC_LIBOBJ invocations to module description. + * m4/wctrans.m4 (gl_FUNC_WCTRANS): Set HAVE_WCTRANS. Move AC_LIBOBJ + invocation from here... + * modules/wctrans (configure.ac): ... to here. + 2011-05-22 Bruno Haible wctomb: Move AC_LIBOBJ invocations to module description. diff --git a/m4/wctrans.m4 b/m4/wctrans.m4 index f09b3fc243..7b956d8557 100644 --- a/m4/wctrans.m4 +++ b/m4/wctrans.m4 @@ -1,4 +1,4 @@ -# wctrans.m4 serial 1 +# wctrans.m4 serial 2 dnl Copyright (C) 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, @@ -8,7 +8,5 @@ AC_DEFUN([gl_FUNC_WCTRANS], [ AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) AC_REQUIRE([gl_WCTYPE_H]) - if test $HAVE_WCTRANS_T = 0; then - AC_LIBOBJ([wctrans]) - fi + HAVE_WCTRANS=$HAVE_WCTRANS_T ]) diff --git a/modules/wctrans b/modules/wctrans index c1eaeaaf76..5147a168a9 100644 --- a/modules/wctrans +++ b/modules/wctrans @@ -11,6 +11,9 @@ wctype-h configure.ac: gl_FUNC_WCTRANS +if test $HAVE_WCTRANS = 0; then + AC_LIBOBJ([wctrans]) +fi gl_WCTYPE_MODULE_INDICATOR([wctrans]) Makefile.am: -- 2.30.2