From: Bruno Haible Date: Mon, 10 Jul 2023 21:11:25 +0000 (+0200) Subject: Apply the last change to all locale-*.m4 files. X-Git-Tag: v1.0~1141 X-Git-Url: https://gitweb.git.savannah.gnu.org/gitweb/?a=commitdiff_plain;h=c321cfa061581e08bf072d287b965b9e0e1e425e;p=gnulib.git Apply the last change to all locale-*.m4 files. * m4/locale-ar.m4 (gt_LOCALE_AR): Reject locale name that might cause trouble with sh or make. * m4/locale-tr.m4 (gt_LOCALE_TR_UTF8): Likewise. --- diff --git a/ChangeLog b/ChangeLog index 4da47ab8b9..a78bd6528d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2023-07-10 Bruno Haible + + Apply the last change to all locale-*.m4 files. + * m4/locale-ar.m4 (gt_LOCALE_AR): Reject locale name that might cause + trouble with sh or make. + * m4/locale-tr.m4 (gt_LOCALE_TR_UTF8): Likewise. + 2023-07-09 Paul Eggert c32width: protect against bad configure args diff --git a/m4/locale-ar.m4 b/m4/locale-ar.m4 index 3c3342db08..2a7f4918d5 100644 --- a/m4/locale-ar.m4 +++ b/m4/locale-ar.m4 @@ -100,5 +100,11 @@ int main () { rm -fr conftest* ]) LOCALE_AR=$gt_cv_locale_ar + case $LOCALE_AR in #( + '' | *[[[:space:]\"\$\'*@<:@]]*) + dnl This locale name might cause trouble with sh or make. + AC_MSG_WARN([invalid locale "$LOCALE_AR"; assuming "none"]) + LOCALE_AR=none;; + esac AC_SUBST([LOCALE_AR]) ]) diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4 index d34df057d1..eb51484ec6 100644 --- a/m4/locale-tr.m4 +++ b/m4/locale-tr.m4 @@ -122,5 +122,11 @@ int main () { rm -fr conftest* ]) LOCALE_TR_UTF8=$gt_cv_locale_tr_utf8 + case $LOCALE_TR_UTF8 in #( + '' | *[[[:space:]\"\$\'*@<:@]]*) + dnl This locale name might cause trouble with sh or make. + AC_MSG_WARN([invalid locale "$LOCALE_TR_UTF8"; assuming "none"]) + LOCALE_TR_UTF8=none;; + esac AC_SUBST([LOCALE_TR_UTF8]) ])