From: Bruno Haible <bruno@clisp.org>
Date: Thu, 4 Sep 2003 21:28:30 +0000 (+0000)
Subject: Portability to Solaris 7.
X-Git-Tag: v0.13~272
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=55c2f71d77c9e31c64ecd709542c19f392ab5414;p=thirdparty%2Fgettext.git

Portability to Solaris 7.
---

diff --git a/gettext-tools/m4/ChangeLog b/gettext-tools/m4/ChangeLog
index e3550425e..1c1ebea4f 100644
--- a/gettext-tools/m4/ChangeLog
+++ b/gettext-tools/m4/ChangeLog
@@ -1,3 +1,7 @@
+2003-09-04  Bruno Haible  <bruno@clisp.org>
+
+	* locale-fr.m4 (gt_LOCALE_FR): Add support for Solaris 7.
+
 2003-08-26  Bruno Haible  <bruno@clisp.org>
 
 	* fnmatch.m4 (_AC_LIBOBJ_FNMATCH): Remove AC_DEFINE of fnmatch here.
diff --git a/gettext-tools/m4/locale-fr.m4 b/gettext-tools/m4/locale-fr.m4
index ee9707c47..854847b02 100644
--- a/gettext-tools/m4/locale-fr.m4
+++ b/gettext-tools/m4/locale-fr.m4
@@ -47,12 +47,17 @@ changequote([,])dnl
             if (LC_ALL=fr_FR.iso88591 ./conftest; exit) 2>/dev/null; then
               gt_cv_locale_fr=fr_FR.iso88591
             else
-              # Special test for NetBSD 1.6.
-              if test -f /usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE; then
-                gt_cv_locale_fr=fr_FR.ISO8859-1
+              # Test for the Solaris 7 locale name.
+              if (LC_ALL=fr ./conftest; exit) 2>/dev/null; then
+                gt_cv_locale_fr=fr
               else
-                # None found.
-                gt_cv_locale_fr=fr_FR
+                # Special test for NetBSD 1.6.
+                if test -f /usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE; then
+                  gt_cv_locale_fr=fr_FR.ISO8859-1
+                else
+                  # None found.
+                  gt_cv_locale_fr=fr_FR
+                fi
               fi
             fi
           fi