From 82604061d22a5663f5a26aafd5c63fc5685aa307 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Fri, 9 Nov 2007 12:24:38 +0100 Subject: [PATCH] Avoid a test failure on BeOS. --- ChangeLog | 5 +++++ m4/locale-tr.m4 | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6f1bad33e..ff7b1d044 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-11-09 Bruno Haible + + * m4/locale-tr.m4 (gt_LOCALE_TR_UTF8) [BeOS]: Make this test return + none instead of tr_TR. Fixes a failure of test-c-strcasecmp.c. + 2007-11-08 Jim Meyering Change cache variable name prefix "jm_" to "gl_" everywhere. diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4 index 3e03bee2d..6bb7847f9 100644 --- a/m4/locale-tr.m4 +++ b/m4/locale-tr.m4 @@ -1,4 +1,4 @@ -# locale-tr.m4 serial 3 +# locale-tr.m4 serial 4 dnl Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -25,22 +25,23 @@ char buf[16]; int main () { /* On BeOS, locales are not implemented in libc. Rather, libintl imitates locale dependent behaviour by looking at the environment - variables, and all locales use the UTF-8 encoding. */ -#if !defined(__BEOS__) + variables, and all locales use the UTF-8 encoding. But BeOS does not + implement the Turkish upper-/lowercase mappings. Therefore, let this + program return 1 on BeOS. */ /* Check whether the given locale name is recognized by the system. */ if (setlocale (LC_ALL, "") == NULL) return 1; /* Check whether nl_langinfo(CODESET) is nonempty. On MacOS X 10.3.5 (Darwin 7.5) in the tr_TR locale, nl_langinfo(CODESET) is empty, and the behaviour of Tcl 8.4 in this locale is not useful. */ -# if HAVE_LANGINFO_CODESET +#if HAVE_LANGINFO_CODESET if (nl_langinfo (CODESET) [0] == '\0') return 1; -# endif -# ifdef __CYGWIN__ +#endif +#ifdef __CYGWIN__ /* On Cygwin, avoid locale names without encoding suffix, because the locale_charset() function relies on the encoding suffix. Note that LC_ALL is set on the command line. */ if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1; -# endif +#endif /* Check whether in the abbreviation of the eighth month, the second character (should be U+011F: LATIN SMALL LETTER G WITH BREVE) is two bytes long, with UTF-8 encoding. */ @@ -53,7 +54,6 @@ int main () { if (towupper ('i') != 0x0130 || towlower (0x0130) != 'i' || towupper(0x0131) != 'I' || towlower ('I') != 0x0131) return 1; -#endif return 0; } changequote([,])dnl -- 2.11.0