From f20cce9961cc96b526ac4dbdfcfc766e7647c203 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Mon, 22 Dec 2008 11:03:54 +0100 Subject: [PATCH] use gnulib's emulation for mb functions 2008-12-22 Paolo Bonzini * autoboot.conf: Request modules emulating mb functions. * configure.ac: Do not look for mb functions here. --- ChangeLog | 5 +++++ autoboot.conf | 6 +++--- configure.ac | 3 +-- gnulib | 2 +- lib/.gitignore | 15 +++++++++++++++ m4/.gitignore | 10 ++++++++++ 6 files changed, 35 insertions(+), 6 deletions(-) diff --git a/ChangeLog b/ChangeLog index 70eeef3..52f1219 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2008-12-22 Paolo Bonzini + + * autoboot.conf: Request modules emulating mb functions. + * configure.ac: Do not look for mb functions here. + 2008-10-03 Paolo Bonzini Jim Meyering diff --git a/autoboot.conf b/autoboot.conf index 4fd361c..49a1b51 100644 --- a/autoboot.conf +++ b/autoboot.conf @@ -18,9 +18,9 @@ # gnulib modules used by this package. gnulib_modules=" - acl alloca extensions getline getopt gettext localcharset \ - memchr memcmp memmove mkstemp obstack pathmax snprintf stdbool stat-macros \ - strerror strverscmp unlocked-io vasnprintf verify" + acl alloca btowc extensions getline getopt gettext localcharset memchr \ + memcmp mbrlen mbrtowc memmove mkstemp obstack pathmax snprintf stdbool \ + stat-macros strerror strverscmp unlocked-io vasnprintf verify wcrtomb wctob" SKIP_PO=t checkout_only_file= diff --git a/configure.ac b/configure.ac index 2b59871..325c09d 100644 --- a/configure.ac +++ b/configure.ac @@ -51,8 +51,7 @@ AM_GNU_GETTEXT_VERSION(0.15) AM_GNU_GETTEXT([external]) AC_CHECK_FUNCS_ONCE(isatty bcopy bzero isascii memcpy memset strchr strtoul - popen pathconf isblank fchown fchmod setlocale wcrtomb - wcscoll btowc) + popen pathconf fchown fchmod setlocale) AC_ARG_ENABLE(pcregrep, [ --enable-pcregrep build the pcregrep test program], diff --git a/gnulib b/gnulib index 29dd8b5..7134da0 160000 --- a/gnulib +++ b/gnulib @@ -1 +1 @@ -Subproject commit 29dd8b5548ce047ce51ff9a73d6c4b50c9886771 +Subproject commit 7134da01c000d5002f856cc9414a4779e56fbd44 diff --git a/lib/.gitignore b/lib/.gitignore index 0adab9c..87fd38f 100644 --- a/lib/.gitignore +++ b/lib/.gitignore @@ -5,6 +5,8 @@ alloca.c alloca.h alloca.in.h asnprintf.c +btowc.c +config.charset copy-acl.c errno.h errno.in.h @@ -27,6 +29,12 @@ gettext.h gettimeofday.c gnulib.mk intprops.h +localcharset.c +localcharset.h +lstat.c +mbrlen.c +mbrtowc.c +mbsinit.c memchr.c memcmp.c memmove.c @@ -43,6 +51,10 @@ quote.h quotearg.c quotearg.h realloc.c +ref-add.sed +ref-add.sin +ref-del.sed +ref-del.sin set-mode-acl.c size_max.h snprintf.c @@ -56,6 +68,7 @@ stdio.h stdio.in.h stdlib.h stdlib.in.h +streq.h strerror.c string.h string.in.h @@ -75,6 +88,8 @@ vasnprintf.h verify.h wchar.h wchar.in.h +wcrtomb.c +wctob.c wctype.h wctype.in.h xalloc-die.c diff --git a/m4/.gitignore b/m4/.gitignore index de92baf..c9ce833 100644 --- a/m4/.gitignore +++ b/m4/.gitignore @@ -1,5 +1,6 @@ acl.m4 alloca.m4 +btowc.m4 codeset.m4 errno_h.m4 error.m4 @@ -33,11 +34,18 @@ lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 +localcharset.m4 +locale-fr.m4 +locale-ja.m4 +locale-zh.m4 lock.m4 longdouble.m4 longlong.m4 +lstat.m4 malloc.m4 +mbrlen.m4 mbrtowc.m4 +mbsinit.m4 mbstate_t.m4 memchr.m4 memcmp.m4 @@ -75,6 +83,8 @@ vasnprintf.m4 visibility.m4 wchar.m4 wchar_t.m4 +wcrtomb.m4 +wctob.m4 wctype.m4 wint_t.m4 xalloc.m4