From 868fa74a641af6e4be343caa1407be5d0de85d67 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 23 Dec 2008 00:48:38 +0100 Subject: [PATCH] Treat Haiku like BeOS. --- ChangeLog | 4 ++++ m4/locale-fr.m4 | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 096a63b06..cbd0f5ed1 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2008-12-22 Bruno Haible + * m4/locale-fr.m4 (gt_LOCALE_FR_UTF8): Treat Haiku like BeOS. + +2008-12-22 Bruno Haible + Work around mbrlen() bugs on AIX, HP-UX, OSF/1, Solaris. * m4/mbrlen.m4 (gl_FUNC_MBRLEN): Set REPLACE_MBRLEN if mbrtowc is being overridden. diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index 5bdd2ca57..0dfb6cec4 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,4 +1,4 @@ -# locale-fr.m4 serial 8 +# locale-fr.m4 serial 9 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, @@ -133,10 +133,10 @@ changequote(,)dnl struct tm t; char buf[16]; int main () { - /* On BeOS, locales are not implemented in libc. Rather, libintl + /* On BeOS nd Haiku, 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__) +#if !(defined __BEOS__ || defined __HAIKU__) /* 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 and not "ASCII" or "646". -- 2.11.0