X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flocale-fr.m4;h=e471839e9f2c0c52d50462a43eff07b65cf35beb;hb=b8462c05181331456c9136877d2539b4f43a01cb;hp=28f342ca3fff256a38db9ee18458a6600a1b086b;hpb=95229319a01f836fadeb0d7dc4645a1abb044dd0;p=gnulib.git

diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4
index 28f342ca3..e471839e9 100644
--- a/m4/locale-fr.m4
+++ b/m4/locale-fr.m4
@@ -1,5 +1,5 @@
-# locale-fr.m4 serial 8
-dnl Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc.
+# locale-fr.m4 serial 10
+dnl Copyright (C) 2003, 2005-2009 Free Software Foundation, Inc.
 dnl This file is free software; the Free Software Foundation
 dnl gives unlimited permission to copy and/or distribute it,
 dnl with or without modifications, as long as this notice is preserved.
@@ -11,7 +11,7 @@ AC_DEFUN([gt_LOCALE_FR],
 [
   AC_REQUIRE([AC_CANONICAL_HOST])
   AC_REQUIRE([AM_LANGINFO_CODESET])
-  AC_CACHE_CHECK([for a traditional french locale], gt_cv_locale_fr, [
+  AC_CACHE_CHECK([for a traditional french locale], [gt_cv_locale_fr], [
     macosx=
 changequote(,)dnl
     case "$host_os" in
@@ -48,7 +48,7 @@ int main () {
      On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situations,
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
      some unit tests fail.  */
 #if HAVE_LANGINFO_CODESET
   {
@@ -120,7 +120,7 @@ dnl Determine the name of a french locale with UTF-8 encoding.
 AC_DEFUN([gt_LOCALE_FR_UTF8],
 [
   AC_REQUIRE([AM_LANGINFO_CODESET])
-  AC_CACHE_CHECK([for a french Unicode locale], gt_cv_locale_fr_utf8, [
+  AC_CACHE_CHECK([for a french Unicode locale], [gt_cv_locale_fr_utf8], [
     AC_LANG_CONFTEST([AC_LANG_SOURCE([
 changequote(,)dnl
 #include <locale.h>
@@ -133,17 +133,17 @@ changequote(,)dnl
 struct tm t;
 char buf[16];
 int main () {
-  /* On BeOS, locales are not implemented in libc.  Rather, libintl
+  /* On BeOS and 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".
      On MacOS X 10.3.5 (Darwin 7.5) in the fr_FR locale, nl_langinfo(CODESET)
      is empty, and the behaviour of Tcl 8.4 in this locale is not useful.
      On OpenBSD 4.0, when an unsupported locale is specified, setlocale()
-     succeeds but then nl_langinfo(CODESET) is "646". In this situations,
+     succeeds but then nl_langinfo(CODESET) is "646". In this situation,
      some unit tests fail.  */
 # if HAVE_LANGINFO_CODESET
   {