diff options
| author | Andreas Rottmann <a.rottmann@gmx.at> | 2009-09-14 12:34:39 +0200 |
|---|---|---|
| committer | Andreas Rottmann <a.rottmann@gmx.at> | 2009-09-14 12:34:39 +0200 |
| commit | 79ca645d222db2e158784642c3b464a47bea26f3 (patch) | |
| tree | 73fa0e7f2f509013ca7ea3395b268c8471b2355b /gnulib-m4/wchar.m4 | |
| parent | 8a927bfd7da41dbe61f3cfeaccbd37c761c0bc36 (diff) | |
| parent | 3bebb94360f1c2333feb8d504a9fa4f96984d8b7 (diff) | |
Merge commit 'upstream/0.9.1.1'
Diffstat (limited to 'gnulib-m4/wchar.m4')
| -rw-r--r-- | gnulib-m4/wchar.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/gnulib-m4/wchar.m4 b/gnulib-m4/wchar.m4 index 2e52a82..ce53a45 100644 --- a/gnulib-m4/wchar.m4 +++ b/gnulib-m4/wchar.m4 @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl Written by Eric Blake. -# wchar.m4 serial 23 +# wchar.m4 serial 25 AC_DEFUN([gl_WCHAR_H], [ @@ -27,7 +27,10 @@ wchar_t w;]], fi AC_SUBST([HAVE_WINT_T]) - if test $gl_cv_header_wchar_h_standalone != yes || test $gt_cv_c_wint_t != yes; then + dnl If <stddef.h> is replaced, then <wchar.h> must also be replaced. + AC_REQUIRE([gl_STDDEF_H]) + + if test $gl_cv_header_wchar_h_standalone != yes || test $gt_cv_c_wint_t != yes || test -n "$STDDEF_H"; then WCHAR_H=wchar.h fi |