# HG changeset patch
# User Bruno Haible <bruno@clisp.org>
# Date 1229942054 -3600
# Node ID 402b52de2fa270fb884cc6d4baa8be748d291ee3
# Parent  961aa3e904c1d4429b24ec8708c25d82d1d64184# Parent  43dfcdcad6892b568dc82dd845bd018b0b298a81
Merge branch 'master' of ssh://haible@git.sv.gnu.org/srv/git/gnulib

diff -r 961aa3e904c1 -r 402b52de2fa2 ChangeLog
--- a/ChangeLog	Mon Dec 22 11:33:52 2008 +0100
+++ b/ChangeLog	Mon Dec 22 11:34:14 2008 +0100
@@ -2,6 +2,12 @@
 
 	* doc/posix-functions/mbtowc.texi: Mention a glibc bug.
 
+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 -r 961aa3e904c1 -r 402b52de2fa2 lib/regex_internal.h
--- a/lib/regex_internal.h	Mon Dec 22 11:33:52 2008 +0100
+++ b/lib/regex_internal.h	Mon Dec 22 11:34:14 2008 +0100
@@ -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 -r 961aa3e904c1 -r 402b52de2fa2 m4/regex.m4
--- a/m4/regex.m4	Mon Dec 22 11:33:52 2008 +0100
+++ b/m4/regex.m4	Mon Dec 22 11:34:14 2008 +0100
@@ -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 -r 961aa3e904c1 -r 402b52de2fa2 modules/regex
--- a/modules/regex	Mon Dec 22 11:33:52 2008 +0100
+++ b/modules/regex	Mon Dec 22 11:34:14 2008 +0100
@@ -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: