From fc3c75c4f89279279077c0af5342305e72371c6e Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Sun, 18 Mar 2007 00:03:06 +0000 Subject: [PATCH] Work around buggy locales in NetBSD 3.0. --- ChangeLog | 5 +++++ m4/locale-fr.m4 | 10 +++++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 9902b25188..06846916a8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2007-03-17 Bruno Haible + + * m4/locale-fr.m4 (gt_LOCALE_FR, gt_LOCALE_FR_UTF8): Check also the + locale's decimal-point character. + 2007-03-17 Bruno Haible * lib/vasnprintf.c (VASNPRINTF): Clear out the memory used for arg_mem diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index 62521a9efb..3c10a8120c 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,4 +1,4 @@ -# locale-fr.m4 serial 4 (gettext-0.16.2) +# locale-fr.m4 serial 5 (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, @@ -53,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 @@ -137,6 +141,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 -- 2.30.2