Mercurial > hg > octave-lyh > gnulib-hg
changeset 15163:ff1ca7dbde1e
wctob: Move AC_LIBOBJ invocations to module description.
* m4/wctob.m4 (gl_FUNC_WCTOB): Set HAVE_WCTOB. Move AC_LIBOBJ and
gl_PREREQ_WCTOB invocations from here...
* modules/wctob (configure.ac): ... to here.
(Depends-on): Update conditions.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sun, 22 May 2011 18:47:27 +0200 |
parents | ec85325c09f0 |
children | 5132e2d88ade |
files | ChangeLog m4/wctob.m4 modules/wctob |
diffstat | 3 files changed, 17 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2011-05-22 Bruno Haible <bruno@clisp.org> + + wctob: Move AC_LIBOBJ invocations to module description. + * m4/wctob.m4 (gl_FUNC_WCTOB): Set HAVE_WCTOB. Move AC_LIBOBJ and + gl_PREREQ_WCTOB invocations from here... + * modules/wctob (configure.ac): ... to here. + (Depends-on): Update conditions. + 2011-05-22 Bruno Haible <bruno@clisp.org> wcsxfrm: Move AC_LIBOBJ invocations to module description.
--- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,4 +1,4 @@ -# wctob.m4 serial 8 +# wctob.m4 serial 9 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, @@ -10,10 +10,10 @@ AC_CHECK_FUNCS_ONCE([wctob]) if test $ac_cv_func_wctob = no; then + HAVE_WCTOB=0 HAVE_DECL_WCTOB=0 - AC_LIBOBJ([wctob]) - gl_PREREQ_WCTOB else + HAVE_WCTOB=1 dnl Solaris 9 has the wctob() function but it does not work. dnl Cygwin 1.7.2 has the wctob() function but it clobbers caller-owned @@ -101,10 +101,7 @@ *yes) ;; *) REPLACE_WCTOB=1 ;; esac - if test $REPLACE_WCTOB = 1; then - AC_LIBOBJ([wctob]) - gl_PREREQ_WCTOB - else + if test $REPLACE_WCTOB = 0; then dnl IRIX 6.5 has the wctob() function but does not declare it. AC_CHECK_DECLS([wctob], [], [], [
--- a/modules/wctob +++ b/modules/wctob @@ -9,10 +9,14 @@ Depends-on: wchar -wctomb [test $ac_cv_func_wctob = no || test $REPLACE_WCTOB = 1] +wctomb [test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1] configure.ac: gl_FUNC_WCTOB +if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then + AC_LIBOBJ([wctob]) + gl_PREREQ_WCTOB +fi gl_WCHAR_MODULE_INDICATOR([wctob]) Makefile.am: