diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/regex_internal.h | 2 | ||||
| -rw-r--r-- | m4/regex.m4 | 2 | ||||
| -rw-r--r-- | modules/regex | 4 |
4 files changed, 12 insertions, 2 deletions
@@ -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 --git a/lib/regex_internal.h b/lib/regex_internal.h index a95c70ac33..47b9e13893 100644 --- 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 38fb7ba399..f3a7b42b38 100644 --- 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 1659e1857e..c6a1235949 100644 --- 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: |