* lib/fnmatch.c (WIDE_CHAR_SUPPORT): Require HAVE_ISWCTYPE, too.

* lib/regex_internal.h (RE_ENABLE_I18N): Likewise.
* m4/fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Check for iswctype, too.
* m4/regex.m4 (gl_PREREQ_REGEX): Likewise.

diff --git a/ChangeLog b/ChangeLog
index f73b2d076ed5f17a07ebf351dac205a3e81ed2af..e8c1b8a404d605bfa6ee4f619e16b67a2cb25b67 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-12-03  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * lib/fnmatch.c (WIDE_CHAR_SUPPORT): Require HAVE_ISWCTYPE, too.
+       * lib/regex_internal.h (RE_ENABLE_I18N): Likewise.
+       * m4/fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Check for iswctype, too.
+       * m4/regex.m4 (gl_PREREQ_REGEX): Likewise.
+
 2006-12-03  Jim Meyering  <jim@meyering.net>
 
        * lib/fts.c (fts_load): Don't set sp->fts_dev here, since

diff --git a/lib/fnmatch.c b/lib/fnmatch.c
index ac3a0dc7cb3db86ee8ce174e2d7b6e98f2646a8a..fd250f42d31248ad69e7b9950d2c6a30aafa48a2 100644 (file)
--- a/lib/fnmatch.c
+++ b/lib/fnmatch.c
@@ -40,7 +40,7 @@
 #include <string.h>
 
 #define WIDE_CHAR_SUPPORT \
-  (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC \
+  (HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_BTOWC && HAVE_ISWCTYPE \
    && HAVE_WMEMCHR && (HAVE_WMEMCPY || HAVE_WMEMPCPY))
 
 /* For platform which support the ISO C amendement 1 functionality we

diff --git a/lib/regex_internal.h b/lib/regex_internal.h
index 9a978b2a9f9ba6d9b7a893472ae54a7d7034598b..fbebc539c351475751e44b8ba33abf18ae96e7da 100644 (file)
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -89,7 +89,7 @@
 # define SIZE_MAX ((size_t) -1)
 #endif
 
-#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC
+#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_WCHAR_H && HAVE_ISWCTYPE && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC
 # define RE_ENABLE_I18N
 #endif
 

diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4
index 9aeaeb56296e3f35fc81e52a4b3b3339013af594..ea520fa6ccf2ce1ef479352c5eecbc42a5f5d90c 100644 (file)
--- a/m4/fnmatch.m4
+++ b/m4/fnmatch.m4
@@ -64,7 +64,7 @@ AC_DEFUN([_AC_LIBOBJ_FNMATCH],
 [AC_REQUIRE([AC_FUNC_ALLOCA])dnl
 AC_REQUIRE([AC_TYPE_MBSTATE_T])dnl
 AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
-AC_CHECK_FUNCS([btowc mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])
+AC_CHECK_FUNCS([btowc iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy])
 AC_CHECK_HEADERS([wchar.h wctype.h])
 AC_LIBOBJ([fnmatch])
 FNMATCH_H=fnmatch.h

diff --git a/m4/regex.m4 b/m4/regex.m4
index 69dc326f7499e5465dba8d0f94e3a2dda1a8fb72..4ba0a03cde20e7a3c0ebdf80f6869ca93ba07443 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -1,4 +1,4 @@
-#serial 40
+#serial 41
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
 # 2006 Free Software Foundation, Inc.
@@ -194,6 +194,6 @@ AC_DEFUN([gl_PREREQ_REGEX],
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AM_LANGINFO_CODESET])
   AC_CHECK_HEADERS_ONCE([wchar.h wctype.h])
-  AC_CHECK_FUNCS_ONCE([mbrtowc mempcpy wcrtomb wcscoll])
+  AC_CHECK_FUNCS_ONCE([iswctype mbrtowc mempcpy wcrtomb wcscoll])
   AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
 ])