From: Bruno Haible <bruno@clisp.org>
Date: Mon, 22 Dec 2008 10:34:14 +0000 (+0100)
Subject: Merge branch 'master' of ssh://haible@git.sv.gnu.org/srv/git/gnulib
X-Git-Tag: v0.1~6533
X-Git-Url: http://erislabs.net/gitweb/?a=commitdiff_plain;h=3e2e5dc1f6ded97ce60498e3ceb67fca5a41b8a8;p=gnulib.git

Merge branch 'master' of ssh://haible@git.sv.gnu.org/srv/git/gnulib
---

3e2e5dc1f6ded97ce60498e3ceb67fca5a41b8a8
diff --cc ChangeLog
index 5b5d9c6a8,49ac738ab..3be5159ee
--- a/ChangeLog
+++ b/ChangeLog
@@@ -1,7 -1,9 +1,13 @@@
 +2008-12-22  Bruno Haible  <bruno@clisp.org>
 +
 +	* 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.