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
index d0394c5adebef93ee81ce4e54d3b57545cf7c9a7..49ac738ab42f6deb06b71e4c7f89b655e36babc2 100644 (file)
--- 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
index a95c70ac335d4f4bc2cde08868d33dbbde3eb393..47b9e13893a2e94ec04a5cc37be575918b90f2ea 100644 (file)
--- 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
index 38fb7ba39940aa3fa0bcef71d55868a3d0ed85b6..f3a7b42b38495f39504938a5fef3c1926d60ad8b 100644 (file)
--- a/m4/regex.m4
+++ b/m4/regex.m4
@@ -219,6 +219,6 @@ AC_DEFUN([gl_PREREQ_REGEX],
   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
index 1659e1857ec7b1a2b3560eef962759f2acf34885..c6a12359491ff85667b5cf487cd981e2cf7a9182 100644 (file)
--- a/modules/regex
+++ b/modules/regex
@@ -13,16 +13,20 @@ m4/mbstate_t.m4
 
 Depends-on:
 alloca
+btowc
 extensions
 gettext-h
 localcharset
 malloc
 memcmp
 memmove
+mbrtowc
+mbsinit
 stdbool
 stdint
 ssize_t
 wchar
+wcrtomb
 wctype
 
 configure.ac: