From e6b06bfd654c2fee14c029654fb82171a50bd3fb Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 1 Sep 2024 12:42:30 +0200 Subject: [PATCH] Fix quoting of $LOCALE_EN_UTF8 (regression yesterday). * m4/iswdigit.m4 (gl_FUNC_ISWDIGIT): Properly quote $LOCALE_EN_UTF8. * m4/iswxdigit.m4 (gl_FUNC_ISWXDIGIT): Likewise. * m4/mbrlen.m4 (gl_MBRLEN_RETVAL): Likewise. * m4/mbrtoc16.m4 (gl_MBRTOC16_NULL_DESTINATION): Likewise. * m4/mbrtowc.m4 (gl_MBRTOWC_INCOMPLETE_STATE, gl_MBRTOWC_NULL_ARG1, gl_MBRTOWC_NULL_ARG2, gl_MBRTOWC_RETVAL, gl_MBRTOWC_STORES_INCOMPLETE): Likewise. * m4/mbsrtowcs.m4 (gl_MBSRTOWCS_WORKS): Likewise. * m4/stdlib_h.m4 (gl_STDLIB_H): Likewise. * m4/wcrtomb.m4 (gl_FUNC_WCRTOMB): Likewise. --- ChangeLog | 24 +++++++++++++++++++----- m4/iswdigit.m4 | 4 ++-- m4/iswxdigit.m4 | 4 ++-- m4/mbrlen.m4 | 4 ++-- m4/mbrtoc16.m4 | 4 ++-- m4/mbrtowc.m4 | 12 ++++++------ m4/mbsrtowcs.m4 | 4 ++-- m4/stdlib_h.m4 | 4 ++-- m4/wcrtomb.m4 | 4 ++-- 9 files changed, 39 insertions(+), 25 deletions(-) diff --git a/ChangeLog b/ChangeLog index b0a5e5b7fa..2a9d575f42 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,17 @@ +2024-09-01 Bruno Haible + + Fix quoting of $LOCALE_EN_UTF8 (regression yesterday). + * m4/iswdigit.m4 (gl_FUNC_ISWDIGIT): Properly quote $LOCALE_EN_UTF8. + * m4/iswxdigit.m4 (gl_FUNC_ISWXDIGIT): Likewise. + * m4/mbrlen.m4 (gl_MBRLEN_RETVAL): Likewise. + * m4/mbrtoc16.m4 (gl_MBRTOC16_NULL_DESTINATION): Likewise. + * m4/mbrtowc.m4 (gl_MBRTOWC_INCOMPLETE_STATE, gl_MBRTOWC_NULL_ARG1, + gl_MBRTOWC_NULL_ARG2, gl_MBRTOWC_RETVAL, gl_MBRTOWC_STORES_INCOMPLETE): + Likewise. + * m4/mbsrtowcs.m4 (gl_MBSRTOWCS_WORKS): Likewise. + * m4/stdlib_h.m4 (gl_STDLIB_H): Likewise. + * m4/wcrtomb.m4 (gl_FUNC_WCRTOMB): Likewise. + 2024-09-01 Bruno Haible doc: Mention how to obtain UTF-8 locales. @@ -14,9 +28,9 @@ Strengthen LC_CTYPE configure tests on OpenBSD, Android, Haiku. * m4/mbrlen.m4 (gl_MBRLEN_RETVAL): Require gt_LOCALE_EN_UTF8 instead of gt_LOCALE_FR_UTF8. Use LOCALE_EN_UTF8 instead of LOCALE_FR_UTF8. - * m4/mbrtowc.m4 (gl_MBRTOWC_INCOMPLETE_STATE, gl_MBRTOWC_SANITYCHECK, - gl_MBRTOWC_NULL_ARG1, gl_MBRTOWC_NULL_ARG2, gl_MBRTOWC_RETVAL, - gl_MBRTOWC_STORES_INCOMPLETE): Likewise. + * m4/mbrtowc.m4 (gl_MBRTOWC_INCOMPLETE_STATE, gl_MBRTOWC_NULL_ARG1, + gl_MBRTOWC_NULL_ARG2, gl_MBRTOWC_RETVAL, gl_MBRTOWC_STORES_INCOMPLETE): + Likewise. * m4/mbsrtowcs.m4 (gl_MBSRTOWCS_WORKS): Likewise. * m4/wcrtomb.m4 (gl_FUNC_WCRTOMB): Likewise. * m4/mbrtoc16.m4 (gl_MBRTOC16_NULL_DESTINATION): Require @@ -405,8 +419,8 @@ 2024-08-27 Bruno Haible write-any-file: Don't reference an undefined function on native Windows. - * m4/write-any-file.m4 (): Remove test for , obsolete since - 2009-05-03. Test for geteuid. + * m4/write-any-file.m4 (gl_WRITE_ANY_FILE): Remove test for , + obsolete since 2009-05-03. Test for geteuid. * lib/write-any-file.c (geteuid): Define a fallback. 2024-08-27 Bruno Haible diff --git a/m4/iswdigit.m4 b/m4/iswdigit.m4 index 4c71007a63..f07feae495 100644 --- a/m4/iswdigit.m4 +++ b/m4/iswdigit.m4 @@ -1,5 +1,5 @@ # iswdigit.m4 -# serial 8 +# serial 9 dnl Copyright (C) 2020-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -33,7 +33,7 @@ changequote(,)dnl *) gl_cv_func_iswdigit_works="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_FR != none || test $LOCALE_JA != none || test $LOCALE_EN_UTF8 != none || test $LOCALE_ZH_CN != none; then + if test $LOCALE_FR != none || test $LOCALE_JA != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_ZH_CN != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include diff --git a/m4/iswxdigit.m4 b/m4/iswxdigit.m4 index b5ca40e058..1a8e57b0a2 100644 --- a/m4/iswxdigit.m4 +++ b/m4/iswxdigit.m4 @@ -1,5 +1,5 @@ # iswxdigit.m4 -# serial 8 +# serial 9 dnl Copyright (C) 2020-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -32,7 +32,7 @@ changequote(,)dnl *) gl_cv_func_iswxdigit_works="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_JA != none || test $LOCALE_EN_UTF8 != none || test $LOCALE_ZH_CN != none; then + if test $LOCALE_JA != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_ZH_CN != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include diff --git a/m4/mbrlen.m4 b/m4/mbrlen.m4 index 5602c0596b..9e46ca0a24 100644 --- a/m4/mbrlen.m4 +++ b/m4/mbrlen.m4 @@ -1,5 +1,5 @@ # mbrlen.m4 -# serial 13 +# serial 14 dnl Copyright (C) 2008, 2010-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -107,7 +107,7 @@ changequote(,)dnl *) gl_cv_func_mbrlen_retval="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_EN_UTF8 != none || test $LOCALE_JA != none; then + if test "$LOCALE_EN_UTF8" != none || test $LOCALE_JA != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include diff --git a/m4/mbrtoc16.m4 b/m4/mbrtoc16.m4 index a562c7dc7b..0240a0ca1d 100644 --- a/m4/mbrtoc16.m4 +++ b/m4/mbrtoc16.m4 @@ -1,5 +1,5 @@ # mbrtoc16.m4 -# serial 3 +# serial 4 dnl Copyright (C) 2014-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -90,7 +90,7 @@ changequote(,)dnl gl_cv_func_mbrtoc16_null_destination="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_EN_UTF8 != none; then + if test "$LOCALE_EN_UTF8" != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index 618ab8ffe1..ad7a7c73a0 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ # mbrtowc.m4 -# serial 45 +# serial 46 dnl Copyright (C) 2001-2002, 2004-2005, 2008-2024 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -200,7 +200,7 @@ int main () [gl_cv_func_mbrtowc_incomplete_state=no], [:]) else - if test $LOCALE_EN_UTF8 != none; then + if test "$LOCALE_EN_UTF8" != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include @@ -303,7 +303,7 @@ changequote(,)dnl *) gl_cv_func_mbrtowc_null_arg1="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_EN_UTF8 != none; then + if test "$LOCALE_EN_UTF8" != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include @@ -366,7 +366,7 @@ changequote(,)dnl *) gl_cv_func_mbrtowc_null_arg2="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_EN_UTF8 != none; then + if test "$LOCALE_EN_UTF8" != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include @@ -422,7 +422,7 @@ changequote(,)dnl gl_cv_func_mbrtowc_retval="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_EN_UTF8 != none || test $LOCALE_JA != none \ + if test "$LOCALE_EN_UTF8" != none || test $LOCALE_JA != none \ || { case "$host_os" in mingw* | windows*) true;; *) false;; esac; }; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ @@ -650,7 +650,7 @@ int main () ;; *) AC_REQUIRE([gt_LOCALE_EN_UTF8]) - if test $LOCALE_EN_UTF8 != none; then + if test "$LOCALE_EN_UTF8" != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include diff --git a/m4/mbsrtowcs.m4 b/m4/mbsrtowcs.m4 index 29ab325869..7aa1b11e50 100644 --- a/m4/mbsrtowcs.m4 +++ b/m4/mbsrtowcs.m4 @@ -1,5 +1,5 @@ # mbsrtowcs.m4 -# serial 18 +# serial 19 dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -70,7 +70,7 @@ changequote(,)dnl gl_cv_func_mbsrtowcs_works="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_FR != none || test $LOCALE_EN_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then + if test $LOCALE_FR != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include diff --git a/m4/stdlib_h.m4 b/m4/stdlib_h.m4 index b546a438b8..5d9b3017c4 100644 --- a/m4/stdlib_h.m4 +++ b/m4/stdlib_h.m4 @@ -1,5 +1,5 @@ # stdlib_h.m4 -# serial 80 +# serial 81 dnl Copyright (C) 2007-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -51,7 +51,7 @@ changequote(,)dnl *) gl_cv_macro_MB_CUR_MAX_good="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_EN_UTF8 != none; then + if test "$LOCALE_EN_UTF8" != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include diff --git a/m4/wcrtomb.m4 b/m4/wcrtomb.m4 index 5d8388c344..cc0e935f24 100644 --- a/m4/wcrtomb.m4 +++ b/m4/wcrtomb.m4 @@ -1,5 +1,5 @@ # wcrtomb.m4 -# serial 20 +# serial 21 dnl Copyright (C) 2008-2024 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -90,7 +90,7 @@ changequote(,)dnl gl_cv_func_wcrtomb_retval="guessing yes" ;; esac changequote([,])dnl - if test $LOCALE_FR != none || test $LOCALE_EN_UTF8 != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then + if test $LOCALE_FR != none || test "$LOCALE_EN_UTF8" != none || test $LOCALE_JA != none || test $LOCALE_ZH_CN != none; then AC_RUN_IFELSE( [AC_LANG_SOURCE([[ #include -- 2.39.5