X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Flocale-fr.m4;h=a33f0680dd648ba2e71538b88437a044835cc137;hb=606dd130bdce412935eca78598923720a7e346c4;hp=22864cebb6caedd959b3990889e6b1e40cf7f252;hpb=736119c28bcec850f35474aa183633a347b228eb;p=gnulib.git

diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4
index 22864cebb..a33f0680d 100644
--- a/m4/locale-fr.m4
+++ b/m4/locale-fr.m4
@@ -1,5 +1,5 @@
-# locale-fr.m4 serial 3 (gettext-0.15)
-dnl Copyright (C) 2003, 2005-2006 Free Software Foundation, Inc.
+# locale-fr.m4 serial 6 (gettext-0.16.2)
+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,
 dnl with or without modifications, as long as this notice is preserved.
@@ -13,10 +13,12 @@ AC_DEFUN([gt_LOCALE_FR],
   AC_REQUIRE([AM_LANGINFO_CODESET])
   AC_CACHE_CHECK([for a traditional french locale], gt_cv_locale_fr, [
     macosx=
+changequote(,)dnl
     case "$host_os" in
       darwin[56]*) ;;
       darwin*) macosx=yes;;
     esac
+changequote([,])dnl
     if test -n "$macosx"; then
       # On Darwin 7 (MacOS X), the libc supports some locales in non-UTF-8
       # encodings, but the kernel does not support them. The documentation
@@ -51,6 +53,10 @@ int main () {
      one byte long. This excludes the UTF-8 encoding.  */
   t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
   if (strftime (buf, sizeof (buf), "%b", &t) < 3 || buf[2] != 'v') return 1;
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point[0] != ',') return 1;
   return 0;
 }
 changequote([,])dnl
@@ -80,13 +86,8 @@ changequote([,])dnl
                 if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
                   gt_cv_locale_fr=fr
                 else
-                  # Special test for NetBSD 1.6.
-                  if test -f /usr/share/locale/fr_FR.ISO8859-1/LC_CTYPE; then
-                    gt_cv_locale_fr=fr_FR.ISO8859-1
-                  else
-                    # None found.
-                    gt_cv_locale_fr=none
-                  fi
+                  # None found.
+                  gt_cv_locale_fr=none
                 fi
               fi
             fi
@@ -135,6 +136,10 @@ int main () {
       || buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
     return 1;
 #endif
+  /* Check whether the decimal separator is a comma.
+     On NetBSD 3.0 in the fr_FR.ISO8859-1 locale, localeconv()->decimal_point
+     are nl_langinfo(RADIXCHAR) are both ".".  */
+  if (localeconv () ->decimal_point[0] != ',') return 1;
   return 0;
 }
 changequote([,])dnl