Re: Strengthen LC_CTYPE configure tests on OpenBSD, Android, Haiku

bug-gnulib
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Strengthen LC_CTYPE configure tests on OpenBSD, Android, Haiku

From:	Bruno Haible
Subject:	Re: Strengthen LC_CTYPE configure tests on OpenBSD, Android, Haiku
Date:	Sun, 01 Sep 2024 13:04:55 +0200
Yesterday I did:
>       * 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.
>       ...

Oops, I forgot that LOCALE_EN_UTF8 can be "English_United States.65001", which
contains a space.


2024-09-01  Bruno Haible  <bruno@clisp.org>

        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.

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 @@ AC_DEFUN([gl_FUNC_ISWDIGIT]
          *) 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 <locale.h>
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 @@ AC_DEFUN([gl_FUNC_ISWXDIGIT]
          *) 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 <locale.h>
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 @@ AC_DEFUN([gl_MBRLEN_RETVAL]
         *)                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 <locale.h>
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 @@ AC_DEFUN([gl_MBRTOC16_NULL_DESTINATION]
           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 <locale.h>
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 @@ AC_DEFUN([gl_MBRTOWC_INCOMPLETE_STATE]
           [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 <locale.h>
@@ -303,7 +303,7 @@ AC_DEFUN([gl_MBRTOWC_NULL_ARG1]
         *)        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 <locale.h>
@@ -366,7 +366,7 @@ AC_DEFUN([gl_MBRTOWC_NULL_ARG2]
         *)    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 <locale.h>
@@ -422,7 +422,7 @@ AC_DEFUN([gl_MBRTOWC_RETVAL]
           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 @@ AC_DEFUN([gl_MBRTOWC_STORES_INCOMPLETE]
          ;;
        *)
          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 <locale.h>
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 @@ AC_DEFUN([gl_MBSRTOWCS_WORKS]
           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 <locale.h>
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 @@ AC_DEFUN_ONCE([gl_STDLIB_H]
         *)                 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 <locale.h>
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 @@ AC_DEFUN([gl_FUNC_WCRTOMB]
               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 <locale.h>
[Prev in Thread]
Current Thread
[Next in Thread]
Re: Strengthen LC_CTYPE configure tests on OpenBSD, Android, Haiku, Bruno Haible <=
Prev by Date: doc: Mention how to obtain UTF-8 locales
Next by Date: Fix mbscasestr test failure on native Windows with MSVC
Previous by thread: doc: Mention how to obtain UTF-8 locales
Next by thread: Fix mbscasestr test failure on native Windows with MSVC
Index(es):
- Date
- Thread