From: Bruno Haible <bruno@clisp.org>
Date: Mon, 22 Dec 2008 23:48:38 +0000 (+0100)
Subject: Treat Haiku like BeOS.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=868fa74a641af6e4be343caa1407be5d0de85d67;p=pspp

Treat Haiku like BeOS.
---

diff --git a/ChangeLog b/ChangeLog
index 096a63b064..cbd0f5ed1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2008-12-22  Bruno Haible  <bruno@clisp.org>
+
+	* m4/locale-fr.m4 (gt_LOCALE_FR_UTF8): Treat Haiku like BeOS.
+
 2008-12-22  Bruno Haible  <bruno@clisp.org>
 
 	Work around mbrlen() bugs on AIX, HP-UX, OSF/1, Solaris.
diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4
index 5bdd2ca57c..0dfb6cec48 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".