[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: locale-ar.m4
From: |
Bruno Haible |
Subject: |
Re: locale-ar.m4 |
Date: |
Sun, 2 Jan 2011 14:37:50 +0100 |
User-agent: |
KMail/1.9.9 |
Hi Ben,
> * m4/locale-ar.m4: New file.
I've tested this macro on the systems that have an ISO-8859-6 locale (see
lib/config.charset):
* glibc
Has ar_SA and ar_EG.
config.status contains: S["LOCALE_AR"]="ar_SA"
OK
* HP-UX 11
Has ar_SA.iso88596.
config.status contains: S["LOCALE_AR"]="none"
Wrong, should be: S["LOCALE_AR"]="ar_SA.iso88596"
* Solaris 7
Has ar.
config.status contains: S["LOCALE_AR"]="none"
Wrong, should be: S["LOCALE_AR"]="ar"
* Cygwin 1.7
Has ar_SA.ISO-8859-6 and ar_EG.ISO-8859-6.
config.status contains: S["LOCALE_AR"]="none"
Wrong, should be: S["LOCALE_AR"]="ar_SA.ISO-8859-6"
This patch fixes it.
Note that the test whether the name of the first month begins with U+0643
did not succeed on Solaris 7 with "ar" and also not on glibc systems with
"ar_EG". I'm therefore removing it.
2011-01-02 Bruno Haible <address@hidden>
Fix detection of traditional Arabic locale on HP-UX, Solaris, Cygwin.
* m4/locale-ar.m4 (gt_LOCALE_AR): Require that the locale encoding name
ends in "6". Don't require a specific month name. Try also the locale
names found on HP-UX 11 and Solaris 7.
--- m4/locale-ar.m4.orig Sun Jan 2 14:33:23 2011
+++ m4/locale-ar.m4 Sun Jan 2 14:14:12 2011
@@ -1,4 +1,4 @@
-# locale-ar.m4 serial 1
+# locale-ar.m4 serial 2
dnl Copyright (C) 2003, 2005-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -26,12 +26,13 @@
int main () {
/* Check whether the given locale name is recognized by the system. */
if (setlocale (LC_ALL, "") == NULL) return 1;
- /* Check that nl_langinfo(CODESET) is nonempty and not "ASCII" or "646". */
+ /* Check that nl_langinfo(CODESET) is nonempty and not "ASCII" or "646"
+ and ends in "6". */
#if HAVE_LANGINFO_CODESET
{
const char *cs = nl_langinfo (CODESET);
if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
- || strcmp (cs, "UTF-8") == 0)
+ || cs[strlen (cs) - 1] != '6')
return 1;
}
#endif
@@ -41,11 +42,6 @@
LC_ALL is set on the command line. */
if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
#endif
- /* Check that the name of the first month begins with U+0643 (ك) as encoded
- by ISO 8859-6. This excludes the UTF-8 encoding. */
- t.tm_year = 1975 - 1900; t.tm_mon = 1 - 1; t.tm_mday = 4;
- strftime (buf, sizeof (buf), "%B", &t);
- if ((unsigned char) buf[0] != 0xe3) return 1;
return 0;
}
changequote([,])dnl
@@ -55,9 +51,17 @@
# otherwise on MacOS X 10.3.5 the LC_TIME=C from the beginning of the
# configure script would override the LC_ALL setting. Likewise for
# LC_CTYPE, which is also set at the beginning of the configure script.
- # Test for the usual locale name.
- for gt_cv_locale_ar in ar_SA ar_SA.ISO-8859-6 ar_EG ar_EG.ISO-8859-6
none; do
- if test $gt_cv_locale_ar = none || (LC_ALL=$gt_cv_locale_ar LC_TIME=
LC_CTYPE= ./conftest; exit) 2>/dev/null; then
+ # Values tested:
+ # - The usual locale name: ar_SA
+ # - The locale name with explicit encoding suffix: ar_SA.ISO-8859-6
+ # - The HP-UX locale name: ar_SA.iso88596
+ # - The Solaris 7 locale name: ar
+ # Also try ar_EG instead of ar_SA because Egypt is a large country too.
+ for gt_cv_locale_ar in ar_SA ar_SA.ISO-8859-6 ar_SA.iso88596 ar_EG
ar_EG.ISO-8859-6 ar_EG.iso88596 ar none; do
+ if test $gt_cv_locale_ar = none; then
+ break
+ fi
+ if (LC_ALL=$gt_cv_locale_ar LC_TIME= LC_CTYPE= ./conftest; exit)
2>/dev/null; then
break
fi
done
- Re: locale-ar.m4,
Bruno Haible <=