Avoid false report of ja_JP.EUC-JP locale under Cygwin.

diff --git a/ChangeLog b/ChangeLog
index b64554b4ffdc69deb3db9409b9d0a1caf4ca7a6d..3c94385a8d54252cf7baa56a357ec65ce111e6ad 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-20  Bruno Haible  <bruno@clisp.org>
+
+       Don't pretend that Cygwin has a ja_JP.EUC-JP locale.
+       * m4/locale-ja.m4 (gt_LOCALE_JA): Add test for MB_CUR_MAX. Needed on
+       Cygwin 1.5.x.
+
 2008-12-20  Bruno Haible  <bruno@clisp.org>
 
        Ensure mbstate_t is defined on HP-UX 11.11.

diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4
index cb85ed335b99e211cfd29fa0b1334c5ec635c4a0..c42064f721f2a7a4d8f6c05f38cee870b4b9e591 100644 (file)
--- a/m4/locale-ja.m4
+++ b/m4/locale-ja.m4
@@ -1,4 +1,4 @@
-# locale-ja.m4 serial 4
+# locale-ja.m4 serial 5
 dnl Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
@@ -65,6 +65,10 @@ int main ()
      LC_ALL is set on the command line.  */
   if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
 #endif
+  /* Check whether MB_CUR_MAX is > 1.  This excludes the dysfunctional locales
+     on Cygwin 1.5.x.  */
+  if (MB_CUR_MAX == 1)
+    return 1;
   /* Check whether in a month name, no byte in the range 0x80..0x9F occurs.
      This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;