diff options
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | m4/wctype.m4 | 6 | ||||
| -rw-r--r-- | modules/wctype | 5 |
3 files changed, 14 insertions, 5 deletions
@@ -1,5 +1,13 @@ 2011-05-22 Bruno Haible <bruno@clisp.org> + wctype: Move AC_LIBOBJ invocations to module description. + * m4/wctype.m4 (gl_FUNC_WCTYPE): Set HAVE_WCTYPE. Move AC_LIBOBJ + invocation from here... + * modules/wctype (configure.ac): ... to here. + (Depends-on): Update conditions. + +2011-05-22 Bruno Haible <bruno@clisp.org> + wctrans: Move AC_LIBOBJ invocations to module description. * m4/wctrans.m4 (gl_FUNC_WCTRANS): Set HAVE_WCTRANS. Move AC_LIBOBJ invocation from here... diff --git a/m4/wctype.m4 b/m4/wctype.m4 index 93c50d3fa1..f6e85addc3 100644 --- a/m4/wctype.m4 +++ b/m4/wctype.m4 @@ -1,4 +1,4 @@ -# wctype.m4 serial 1 +# wctype.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_WCTYPE], [ AC_REQUIRE([gl_WCTYPE_H_DEFAULTS]) AC_REQUIRE([gl_WCTYPE_H]) - if test $HAVE_WCTYPE_T = 0; then - AC_LIBOBJ([wctype]) - fi + HAVE_WCTYPE=$HAVE_WCTYPE_T ]) diff --git a/modules/wctype b/modules/wctype index ffc76a863e..4a9a004b16 100644 --- a/modules/wctype +++ b/modules/wctype @@ -14,10 +14,13 @@ m4/wctype.m4 Depends-on: wctype-h -iswblank [test $HAVE_WCTYPE_T = 0] +iswblank [test $HAVE_WCTYPE = 0] configure.ac: gl_FUNC_WCTYPE +if test $HAVE_WCTYPE = 0; then + AC_LIBOBJ([wctype]) +fi gl_WCTYPE_MODULE_INDICATOR([wctype]) Makefile.am: |