Make the test work on Cygwin.

diff --git a/gettext-tools/tests/ChangeLog b/gettext-tools/tests/ChangeLog
index 61ddc45999b9fe42d450cfc4289f19ef1935e2db..af1099dedd6447705b554679a3a26fd5099ce129 100644 (file)
--- a/gettext-tools/tests/ChangeLog
+++ b/gettext-tools/tests/ChangeLog
@@ -1,3 +1,9 @@
+2006-05-16  Bruno Haible  <bruno@clisp.org>
+
+       * gettext-4-prg.c: Set the LC_ALL environment variable, not just LANG.
+       Needed on non-glibc Unix systems where !HAVE_LOCALE_NULL and
+       _nl_locale_name_default() = "C".
+
 2006-05-14  Bruno Haible  <bruno@clisp.org>
 
        * xgettext-php-2: New file.

diff --git a/gettext-tools/tests/gettext-4-prg.c b/gettext-tools/tests/gettext-4-prg.c
index 67a9bb8e7e4af50e4d37781179f69e4e83c8290d..dea6d48f27ee42d04255d9318daa856bdc8bfe1d 100644 (file)
--- a/gettext-tools/tests/gettext-4-prg.c
+++ b/gettext-tools/tests/gettext-4-prg.c
@@ -46,11 +46,8 @@ main (void)
   unsetenv ("LANG");
   unsetenv ("OUTPUT_CHARSET");
 
-  setlocale (LC_ALL, "de_DE.ISO-8859-1");
-  /* Need to set LANGUAGE explicitly, because on MacOS X, when no LC_*
-     environment variable is set, LANGUAGE defaults to the value of
-     _nl_language_preferences_default (), which is not under our control.  */
-  xsetenv ("LANGUAGE", "de_DE", 1);
+  xsetenv ("LC_ALL", "de_DE.ISO-8859-1", 1);
+  setlocale (LC_ALL, "");
   textdomain ("codeset");
   bindtextdomain ("codeset", ".");