From: Date: September 15 2005 6:47am
Subject: bk commit into 5.0 tree (shuichi:1.1964) BUG#3982
List-Archive: http://lists.mysql.com/internals/29881
X-Bug: 3982
Message-Id: <20050915044735.E2DAF8B8CD@linux.mysql.com>

Below is the list of changes that have just been committed into a local
5.0 repository of shuichi. When shuichi does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.1964 05/09/14 21:47:24 shuichi@stripped +2 -0
  Fix for Bug#3982
  Added check for availability of multibyte characters and functions

  configure.in
    1.346 05/09/14 21:47:09 shuichi@stripped +1 -0
    Fix for Bug#3982
    Added check for availability of multibyte characters and functions

  config/ac-macros/readline.m4
    1.3 05/09/14 21:47:09 shuichi@stripped +39 -0
    Fix for Bug#3982
    Added check for availability of multibyte characters and functions

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	shuichi
# Host:	linux.mysql.com
# Root:	/home/shuichi/apps/mysql/bk/mysql-5.0b

--- 1.345/configure.in	2005-09-12 17:00:46 -07:00
+++ 1.346/configure.in	2005-09-14 21:47:09 -07:00
@@ -1820,6 +1820,7 @@
 MYSQL_STRUCT_DIRENT_D_INO
 MYSQL_STRUCT_DIRENT_D_NAMLEN
 MYSQL_TYPE_SIGHANDLER
+MYSQL_CHECK_MULTIBYTE
 if test "$with_named_curses" = "no"
 then
   MYSQL_CHECK_LIB_TERMCAP

--- 1.2/config/ac-macros/readline.m4	2004-12-04 10:48:51 -08:00
+++ 1.3/config/ac-macros/readline.m4	2005-09-14 21:47:09 -07:00
@@ -59,3 +59,42 @@
         )
     )
 ])
+
+dnl
+dnl check for availability of multibyte characters and functions
+dnl (Based on BASH_CHECK_MULTIBYTE in aclocal.m4 of readline-5.0)
+dnl
+AC_DEFUN([MYSQL_CHECK_MULTIBYTE],
+[
+AC_CHECK_HEADERS(wctype.h)
+AC_CHECK_HEADERS(wchar.h)
+AC_CHECK_HEADERS(langinfo.h)
+
+AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE([HAVE_MBSRTOWCS],[],[Define if you have mbsrtowcs]))
+AC_CHECK_FUNC(mbrtowc, AC_DEFINE([HAVE_MBRTOWC],[],[Define if you have mbrtowc]))
+AC_CHECK_FUNC(mbrlen, AC_DEFINE([HAVE_MBRLEN],[],[Define if you have mbrlen]))
+AC_CHECK_FUNC(wctomb, AC_DEFINE([HAVE_WCTOMB],[],[Define if you have wctomb]))
+AC_CHECK_FUNC(wcwidth, AC_DEFINE([HAVE_WCWIDTH],[],[Define if you have wcwidth]))
+AC_CHECK_FUNC(wcsdup, AC_DEFINE([HAVE_WCSDUP],[],[Define if you check wcsdup]))
+
+AC_CACHE_CHECK([for mbstate_t], mysql_cv_have_mbstate_t,
+[AC_TRY_COMPILE([
+#include <wchar.h>], [
+  mbstate_t ps;
+  mbstate_t *psp;
+  psp = (mbstate_t *)0;
+], mysql_cv_have_mbstate_t=yes,  mysql_cv_have_mbstate_t=no)])
+if test $mysql_cv_have_mbstate_t = yes; then
+        AC_DEFINE([HAVE_MBSTATE_T],[],[Define if mysql_cv_have_mbstate_t=yes])
+fi
+
+AC_CACHE_CHECK([for nl_langinfo and CODESET], mysql_cv_langinfo_codeset,
+[AC_TRY_LINK(
+[#include <langinfo.h>],
+[char* cs = nl_langinfo(CODESET);],
+mysql_cv_langinfo_codeset=yes, mysql_cv_langinfo_codeset=no)])
+if test $mysql_cv_langinfo_codeset = yes; then
+  AC_DEFINE([HAVE_LANGINFO_CODESET],[],[Define if mysql_cv_langinfo_codeset=yes])
+fi
+
+])