projects
/
gnulib.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix test failure on Cygwin.
[gnulib.git]
/
m4
/
wchar.m4
diff --git
a/m4/wchar.m4
b/m4/wchar.m4
index
c1ed2c6
..
5c923fa
100644
(file)
--- a/
m4/wchar.m4
+++ b/
m4/wchar.m4
@@
-7,7
+7,7
@@
dnl with or without modifications, as long as this notice is preserved.
dnl Written by Eric Blake.
dnl Written by Eric Blake.
-# wchar.m4 serial
5
+# wchar.m4 serial
6
AC_DEFUN([gl_WCHAR_H],
[
AC_DEFUN([gl_WCHAR_H],
[
@@
-45,6
+45,13
@@
wchar_t w;]],
gl_CHECK_NEXT_HEADERS([wchar.h])
])
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.
AC_DEFUN([gl_WCHAR_MODULE_INDICATOR],
[
dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
@@
-58,6
+65,5
@@
AC_DEFUN([gl_WCHAR_H_DEFAULTS],
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])
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])
])
])