mirror of
https://github.com/MariaDB/server.git
synced 2025-09-02 09:41:40 +03:00
Not all of the necessary tests for multi-byte support in readline
were included in the configure tests. (Bug #46310)
This commit is contained in:
@@ -70,12 +70,16 @@ AC_CHECK_HEADERS(wctype.h)
|
|||||||
AC_CHECK_HEADERS(wchar.h)
|
AC_CHECK_HEADERS(wchar.h)
|
||||||
AC_CHECK_HEADERS(langinfo.h)
|
AC_CHECK_HEADERS(langinfo.h)
|
||||||
|
|
||||||
AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE([HAVE_MBSRTOWCS],[],[Define if you have mbsrtowcs]))
|
AC_CHECK_FUNC(mbrlen, AC_DEFINE(HAVE_MBRLEN,[],[Define if you have mbrlen]))
|
||||||
AC_CHECK_FUNC(mbrtowc, AC_DEFINE([HAVE_MBRTOWC],[],[Define if you have mbrtowc]))
|
AC_CHECK_FUNC(mbscmp, AC_DEFINE(HAVE_MBSCMP,[],[Define if you have mbscmp]))
|
||||||
AC_CHECK_FUNC(mbrlen, AC_DEFINE([HAVE_MBRLEN],[],[Define if you have mbrlen]))
|
AC_CHECK_FUNC(mbsrtowcs, AC_DEFINE(HAVE_MBSRTOWCS,[],[Define if you have mbsrtowcs]))
|
||||||
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(wcrtomb, AC_DEFINE(HAVE_WCRTOMB,[],[Define if you have wcrtomb]))
|
||||||
AC_CHECK_FUNC(wcsdup, AC_DEFINE([HAVE_WCSDUP],[],[Define if you check wcsdup]))
|
AC_CHECK_FUNC(mbrtowc, AC_DEFINE(HAVE_MBRTOWC,[],[Define if you have mbrtowc]))
|
||||||
|
AC_CHECK_FUNC(wcscoll, AC_DEFINE(HAVE_WCSCOLL,[],[Define if you have wcscoll]))
|
||||||
|
AC_CHECK_FUNC(wcsdup, AC_DEFINE(HAVE_WCSDUP,[],[Define if you have wcsdup]))
|
||||||
|
AC_CHECK_FUNC(wcwidth, AC_DEFINE(HAVE_WCWIDTH,[],[Define if you have wcwidth]))
|
||||||
|
AC_CHECK_FUNC(wctype, AC_DEFINE(HAVE_WCTYPE,[],[Define if you have wctype]))
|
||||||
|
|
||||||
AC_CACHE_CHECK([for mbstate_t], mysql_cv_have_mbstate_t,
|
AC_CACHE_CHECK([for mbstate_t], mysql_cv_have_mbstate_t,
|
||||||
[AC_TRY_COMPILE([
|
[AC_TRY_COMPILE([
|
||||||
@@ -88,6 +92,8 @@ if test $mysql_cv_have_mbstate_t = yes; then
|
|||||||
AC_DEFINE([HAVE_MBSTATE_T],[],[Define if mysql_cv_have_mbstate_t=yes])
|
AC_DEFINE([HAVE_MBSTATE_T],[],[Define if mysql_cv_have_mbstate_t=yes])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
AC_CHECK_FUNCS(iswlower iswupper towlower towupper iswctype)
|
||||||
|
|
||||||
AC_CACHE_CHECK([for nl_langinfo and CODESET], mysql_cv_langinfo_codeset,
|
AC_CACHE_CHECK([for nl_langinfo and CODESET], mysql_cv_langinfo_codeset,
|
||||||
[AC_TRY_LINK(
|
[AC_TRY_LINK(
|
||||||
[#include <langinfo.h>],
|
[#include <langinfo.h>],
|
||||||
@@ -97,4 +103,41 @@ if test $mysql_cv_langinfo_codeset = yes; then
|
|||||||
AC_DEFINE([HAVE_LANGINFO_CODESET],[],[Define if mysql_cv_langinfo_codeset=yes])
|
AC_DEFINE([HAVE_LANGINFO_CODESET],[],[Define if mysql_cv_langinfo_codeset=yes])
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
dnl check for wchar_t in <wchar.h>
|
||||||
|
AC_CACHE_CHECK([for wchar_t in wchar.h], bash_cv_type_wchar_t,
|
||||||
|
[AC_TRY_COMPILE(
|
||||||
|
[#include <wchar.h>
|
||||||
|
],
|
||||||
|
[
|
||||||
|
wchar_t foo;
|
||||||
|
foo = 0;
|
||||||
|
], bash_cv_type_wchar_t=yes, bash_cv_type_wchar_t=no)])
|
||||||
|
if test $bash_cv_type_wchar_t = yes; then
|
||||||
|
AC_DEFINE(HAVE_WCHAR_T, 1, [systems should define this type here])
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl check for wctype_t in <wctype.h>
|
||||||
|
AC_CACHE_CHECK([for wctype_t in wctype.h], bash_cv_type_wctype_t,
|
||||||
|
[AC_TRY_COMPILE(
|
||||||
|
[#include <wctype.h>],
|
||||||
|
[
|
||||||
|
wctype_t foo;
|
||||||
|
foo = 0;
|
||||||
|
], bash_cv_type_wctype_t=yes, bash_cv_type_wctype_t=no)])
|
||||||
|
if test $bash_cv_type_wctype_t = yes; then
|
||||||
|
AC_DEFINE(HAVE_WCTYPE_T, 1, [systems should define this type here])
|
||||||
|
fi
|
||||||
|
|
||||||
|
dnl check for wint_t in <wctype.h>
|
||||||
|
AC_CACHE_CHECK([for wint_t in wctype.h], bash_cv_type_wint_t,
|
||||||
|
[AC_TRY_COMPILE(
|
||||||
|
[#include <wctype.h>],
|
||||||
|
[
|
||||||
|
wint_t foo;
|
||||||
|
foo = 0;
|
||||||
|
], bash_cv_type_wint_t=yes, bash_cv_type_wint_t=no)])
|
||||||
|
if test $bash_cv_type_wint_t = yes; then
|
||||||
|
AC_DEFINE(HAVE_WINT_T, 1, [systems should define this type here])
|
||||||
|
fi
|
||||||
|
|
||||||
])
|
])
|
||||||
|
Reference in New Issue
Block a user