# HG changeset patch
# User Paolo Bonzini <bonzini@gnu.org>
# Date 1229939986 -3600
# Node ID 43dfcdcad6892b568dc82dd845bd018b0b298a81
# Parent  003490fec3652c00177bb0ccfbfbaf6370198cce
update regex to use the emulated mb*/wc* functions

* modules/regex: Request emulations for the mb*/wc* functions we need.
* m4/regex.m4: Don't look for those functions here.
* lib/regex_internal.h: Do not check HAVE_WCRTOMB and HAVE_MBRTOWC.

diff --git a/ChangeLog b/ChangeLog
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-22  Paolo Bonzini  <bonzini@gnu.org>
+
+	* modules/regex: Request emulations for the mb*/wc* functions we need.
+	* m4/regex.m4: Don't look for those functions here.
+	* lib/regex_internal.h: Do not check HAVE_WCRTOMB and HAVE_MBRTOWC.
+
 2008-12-22  Bruno Haible  <bruno@clisp.org>
 
 	* modules/fnmatch (Depends-on): Remove duplicated dependency.
diff --git a/lib/regex_internal.h b/lib/regex_internal.h
--- a/lib/regex_internal.h
+++ b/lib/regex_internal.h
@@ -84,7 +84,7 @@
 # define SIZE_MAX ((size_t) -1)
 #endif
 
-#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCRTOMB && HAVE_MBRTOWC && HAVE_WCSCOLL) || _LIBC
+#if (defined MB_CUR_MAX && HAVE_LOCALE_H && HAVE_WCTYPE_H && HAVE_ISWCTYPE && HAVE_WCSCOLL) || _LIBC
 # define RE_ENABLE_I18N
 #endif
 
diff --git a/m4/regex.m4 b/m4/regex.m4
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -219,6 +219,6 @@
   AC_REQUIRE([AC_C_RESTRICT])
   AC_REQUIRE([AC_TYPE_MBSTATE_T])
   AC_CHECK_HEADERS([libintl.h])
-  AC_CHECK_FUNCS_ONCE([isblank iswctype mbrtowc wcrtomb wcscoll])
+  AC_CHECK_FUNCS_ONCE([isblank iswctype wcscoll])
   AC_CHECK_DECLS([isblank], [], [], [#include <ctype.h>])
 ])
diff --git a/modules/regex b/modules/regex
--- a/modules/regex
+++ b/modules/regex
@@ -13,16 +13,20 @@
 
 Depends-on:
 alloca
+btowc
 extensions
 gettext-h
 localcharset
 malloc
 memcmp
 memmove
+mbrtowc
+mbsinit
 stdbool
 stdint
 ssize_t
 wchar
+wcrtomb
 wctype
 
 configure.ac: