X-Git-Url: http://sjero.net/git/?p=wget;a=blobdiff_plain;f=m4%2Fwchar.m4;h=03159640d3a15ae53930bd661a1b808c9e010e56;hp=2e52a82acfb9a94e00ca1ef12729f3294995f64b;hb=2f6aa1d7417df1dfc58597777686fbd77179b9fd;hpb=3419874b2109f62cf21d63c87e45ae6d819fc243

diff --git a/m4/wchar.m4 b/m4/wchar.m4
index 2e52a82a..03159640 100644
--- a/m4/wchar.m4
+++ b/m4/wchar.m4
@@ -1,13 +1,14 @@
 dnl A placeholder for ISO C99 <wchar.h>, for platforms that have issues.
 
-dnl Copyright (C) 2007-2009 Free Software Foundation, Inc.
+dnl Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+dnl 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.
 
 dnl Written by Eric Blake.
 
-# wchar.m4 serial 23
+# wchar.m4 serial 25
 
 AC_DEFUN([gl_WCHAR_H],
 [
@@ -27,7 +28,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