diff options
author | Jörg Frings-Fürst <debian@jff.email> | 2024-03-24 08:54:48 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff.email> | 2024-03-24 08:54:48 +0100 |
commit | 163a663518f33bab48b28431972e580b366b4d49 (patch) | |
tree | f518ffabaca4a0b93f0103d617e803792d3b0b43 /gnulib-m4/locale-ar.m4 | |
parent | 1b3a8d5ad2ea2f099d514d9dd51ebf926a628076 (diff) | |
parent | dd0000f7e25abe6c28d4329d324fd7fcab54094f (diff) |
Merge branch 'release/debian/1.2-1'HEADdebian/1.2-1master
Diffstat (limited to 'gnulib-m4/locale-ar.m4')
-rw-r--r-- | gnulib-m4/locale-ar.m4 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/gnulib-m4/locale-ar.m4 b/gnulib-m4/locale-ar.m4 index 574311da..e7d23f44 100644 --- a/gnulib-m4/locale-ar.m4 +++ b/gnulib-m4/locale-ar.m4 @@ -1,5 +1,5 @@ -# locale-ar.m4 serial 9 -dnl Copyright (C) 2003, 2005-2022 Free Software Foundation, Inc. +# locale-ar.m4 serial 11 +dnl Copyright (C) 2003, 2005-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, dnl with or without modifications, as long as this notice is preserved. @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Ben Pfaff, based on locale-fr.m4 by Bruno Haible. dnl Determine the name of an Arabic locale with traditional encoding. -AC_DEFUN([gt_LOCALE_AR], +AC_DEFUN_ONCE([gt_LOCALE_AR], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AM_LANGINFO_CODESET]) @@ -69,7 +69,7 @@ int main () { # "ge"(!) or "deu"(!) as "German" or "German_Germany.1252", # "ja" as "Japanese" or "Japanese_Japan.932", # and similar. - mingw*) + mingw* | windows*) # Note that on native Windows, the Arabic locale is # "Arabic_Saudi Arabia.1256", and CP1256 is very different from # ISO-8859-6, so we cannot use it here. @@ -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]) ]) |