Re: [bug-gnulib] assume <wchar.h>

[Bruno Haible]

Eric Blake wrote:
> OK to apply this patch, which makes several modules depend on the recently
> added wchar module?
> 
> 2007-01-16  Eric Blake  <address@hidden>
> 
>       * modules/fnmatch (Depends-on): Depend on wchar.
>       * lib/fnmatch.c (WIDE_CHAR_SUPPORT): Assume <wchar.h>.
>       * modules/mbswidth (Depends-on): Depend on wchar.
>       * lib/mbswidth.c: Assume <wchar.h>.
>       * modules/quotearg (Depends-on): Depend on wchar.
>       * lib/quotearg.c: Assume <wchar.h>.
>       * modules/regex (Depends-on): Depend on wchar.
>       * lib/regex_internal.h: Assume <wchar.h>.
>       * modules/stdint (Depends-on): Depend on wchar.
>       * lib/stdint_.h [!defined WCHAR_MIN]: Assume <wchar.h>.

Looks good to me. (The 'stdint' part will make us notice quickly if there's
still some platform out there that doesn't have a <wchar.h>.)

But grep for wchar.h in m4/. The following additional modifications go with
yours:

--- m4/fnmatch.m4       4 Dec 2006 06:41:56 -0000       1.26
+++ m4/fnmatch.m4       16 Jan 2007 15:43:41 -0000
@@ -1,6 +1,6 @@
 # Check for fnmatch.
 
-# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software
+# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software
 # Foundation, Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -65,7 +65,7 @@
 AC_REQUIRE([AC_TYPE_MBSTATE_T])dnl
 AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
 AC_CHECK_FUNCS([btowc iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])
-AC_CHECK_HEADERS([wchar.h wctype.h])
+AC_CHECK_HEADERS([wctype.h])
 AC_LIBOBJ([fnmatch])
 FNMATCH_H=fnmatch.h
 ])# _AC_LIBOBJ_FNMATCH
--- m4/quotearg.m4      22 Dec 2006 00:21:54 -0000      1.7
+++ m4/quotearg.m4      16 Jan 2007 15:43:41 -0000
@@ -1,5 +1,5 @@
-# quotearg.m4 serial 5
-dnl Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc.
+# quotearg.m4 serial 6
+dnl Copyright (C) 2002, 2004, 2005, 2006, 2007 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.
@@ -9,7 +9,6 @@
   AC_LIBOBJ([quotearg])
 
   dnl Prerequisites of lib/quotearg.c.
-  AC_CHECK_HEADERS_ONCE([wchar.h])
   AC_CHECK_FUNCS_ONCE([mbsinit])
   AC_TYPE_MBSTATE_T
   gl_FUNC_MBRTOWC
--- m4/regex.m4 22 Dec 2006 00:21:54 -0000      1.59
+++ m4/regex.m4 16 Jan 2007 15:43:41 -0000
@@ -1,7 +1,7 @@
-#serial 41
+#serial 42
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006 Free Software Foundation, Inc.
+# 2006, 2007 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -193,7 +193,6 @@
   AC_REQUIRE([AC_GNU_SOURCE])
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AM_LANGINFO_CODESET])
-  AC_CHECK_HEADERS_ONCE([wchar.h])
   AC_CHECK_FUNCS_ONCE([iswctype mbrtowc mempcpy wcrtomb wcscoll])
   AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
 ])