Mercurial > gnulib
changeset 30190:03cdea1c8b78
Avoid assigning WCHAR_H in different .m4 files.
author | Bruno Haible <bruno@clisp.org> |
---|---|
date | Sat, 27 Sep 2008 19:13:21 +0200 |
parents | 20a9c8c912b3 |
children | 988b942ceba9 |
files | ChangeLog m4/wchar.m4 m4/wcwidth.m4 |
diffstat | 3 files changed, 18 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Sep 27 17:55:04 2008 +0200 +++ b/ChangeLog Sat Sep 27 19:13:21 2008 +0200 @@ -1,3 +1,9 @@ +2008-09-27 Bruno Haible <bruno@clisp.org> + + * m4/wchar.m4 (gl_REPLACE_WCHAR_H): New macro. + * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Invoke it instead of assigning + WCHAR_H directly. + 2008-09-27 Bruno Haible <bruno@clisp.org> * lib/arpa_inet.in.h: Include the GL_LINK_WARNING anchor.
--- a/m4/wchar.m4 Sat Sep 27 17:55:04 2008 +0200 +++ b/m4/wchar.m4 Sat Sep 27 19:13:21 2008 +0200 @@ -7,7 +7,7 @@ dnl Written by Eric Blake. -# wchar.m4 serial 5 +# wchar.m4 serial 6 AC_DEFUN([gl_WCHAR_H], [ @@ -45,6 +45,13 @@ gl_CHECK_NEXT_HEADERS([wchar.h]) ]) +dnl Unconditionally enables the replacement of <wchar.h>. +AC_DEFUN([gl_REPLACE_WCHAR_H], +[ + AC_REQUIRE([gl_WCHAR_H_DEFAULTS]) + WCHAR_H=wchar.h +]) + AC_DEFUN([gl_WCHAR_MODULE_INDICATOR], [ dnl Use AC_REQUIRE here, so that the default settings are expanded once only. @@ -58,6 +65,5 @@ dnl Assume proper GNU behavior unless another module says otherwise. HAVE_DECL_WCWIDTH=1; AC_SUBST([HAVE_DECL_WCWIDTH]) REPLACE_WCWIDTH=0; AC_SUBST([REPLACE_WCWIDTH]) - WCHAR_H= - AC_SUBST([WCHAR_H]) + WCHAR_H=''; AC_SUBST([WCHAR_H]) ])
--- a/m4/wcwidth.m4 Sat Sep 27 17:55:04 2008 +0200 +++ b/m4/wcwidth.m4 Sat Sep 27 19:13:21 2008 +0200 @@ -1,5 +1,5 @@ -# wcwidth.m4 serial 13 -dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc. +# wcwidth.m4 serial 14 +dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -80,6 +80,6 @@ fi if test $REPLACE_WCWIDTH = 1 || test $HAVE_DECL_WCWIDTH = 0; then - WCHAR_H=wchar.h + gl_REPLACE_WCHAR_H fi ])