From 819204346025aaaed205c9191ec7a1729cf146e3 Mon Sep 17 00:00:00 2001 From: Daniel Shahaf Date: Sun, 5 Jan 2020 19:13:22 +0000 Subject: 45246: Make --disable-multibyte warn, since the test suite fails in that configuration. --- ChangeLog | 5 +++++ configure.ac | 15 +++++++++++++++ 2 files changed, 20 insertions(+) diff --git a/ChangeLog b/ChangeLog index 399623a10..c97db5969 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2020-01-06 Daniel Shahaf + + * 45246: configure.ac: Make --disable-multibyte warn, since + the test suite fails in that configuration. + 2020-01-06 Daniel Shahaf * 45213: README, configure.ac: Make --enable-gdbm default to diff --git a/configure.ac b/configure.ac index 256584538..4556d3806 100644 --- a/configure.ac +++ b/configure.ac @@ -2553,6 +2553,7 @@ wmemcpy wmemmove wmemset; do AC_MSG_NOTICE([all functions found, multibyte support enabled]) zsh_cv_c_unicode_support=yes else + # Warns at the end of configure AC_MSG_NOTICE([missing functions, multibyte support disabled]) zsh_cv_c_unicode_support=no fi @@ -3299,4 +3300,18 @@ fi echo "See config.modules for installed modules and functions. " +if test x$zsh_cv_c_unicode_support != xyes; then + if test "x$zfuncs_absent" = x; then + # The user opted out. + AC_MSG_WARN([You have chosen to build without multibyte support.]) + AC_MSG_WARN([This configuration may not be suitable for production use. It is known to cause errors in 'make test'. We strongly recommend to re-run configure with --enable-multibyte.]) + else + # Some requisite functions are missing. + AC_MSG_WARN([Multibyte support cannot be enabled: some standard library functions are missing: $zfuncs_absent]) + AC_MSG_WARN([This configuration may not be suitable for production use. It is known to cause errors in 'make test'. If your system provides those functions, we recommend to re-run configure appropriately.]) + # If your system doesn't have those functions, consider patching the + # test suite and sending the patch to zsh-workers@ for inclusion. + fi +fi + exit 0 -- cgit 1.4.1