[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
locale-fr.m4 and Bionic
From: |
Bruno Haible |
Subject: |
locale-fr.m4 and Bionic |
Date: |
Sat, 21 Jan 2012 14:40:14 +0100 |
User-agent: |
KMail/4.7.4 (Linux/3.1.0-1.2-desktop; KDE/4.7.4; x86_64; ; ) |
Hi,
Cross-compiling a testdir, I see these problems during the configuration:
checking whether mbrtowc handles a NULL pwc argument... ../configure: line
22091: test: !=: unary operator expected
guessing yes
checking whether mbrtowc handles a NULL string argument... ../configure: line
22168: test: !=: unary operator expected
guessing yes
checking whether mbrtowc has a correct return value... ../configure: line
22235: test: !=: unary operator expected
guessing yes
checking whether btowc(EOF) is correct... ../configure: line 28332: test: !=:
unary operator expected
guessing yes
checking whether mbsrtowcs works... ../configure: line 47764: test: !=: unary
operator expected
../configure: line 47764: test: !=: unary operator expected
guessing yes
checking whether wcrtomb return value is correct... ../configure: line 70322:
test: !=: unary operator expected
../configure: line 70322: test: !=: unary operator expected
guessing yes
checking whether wcsrtombs updates the source pointer correctly...
../configure: line 71497: test: !=: unary operator expected
guessing yes
checking whether wcsrtombs supports a NULL argument correctly... ../configure:
line 71563: test: !=: unary operator expected
guessing yes
checking whether wctob works... ../configure: line 71952: test: !=: unary
operator expected
guessing yes
The reason is that $LOCALE_FR and $LOCALE_FR_UTF8 are empty. A peek into
config.log reveals a compilation error in the line that accesses
localeconv () ->decimal_point[0]
This fixes it.
2012-01-21 Bruno Haible <address@hidden>
locale-fr.m4: Fix for Android.
* m4/locale-fr.m4 (gt_LOCALE_FR, gt_LOCALE_FR_UTF8): Avoid compilation
failure of the test program on Bionic libc.
--- m4/locale-fr.m4.orig Sat Jan 21 14:35:54 2012
+++ m4/locale-fr.m4 Sat Jan 21 13:44:22 2012
@@ -1,4 +1,4 @@
-# locale-fr.m4 serial 14
+# locale-fr.m4 serial 15
dnl Copyright (C) 2003, 2005-2012 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -63,10 +63,12 @@
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;
+#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */
/* 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;
+#endif
return 0;
}
changequote([,])dnl
@@ -189,10 +191,12 @@
|| buf[1] != (char) 0xc3 || buf[2] != (char) 0xa9 || buf[3] != 'v')
return 1;
#endif
+#if !defined __BIONIC__ /* Bionic libc's 'struct lconv' is just a dummy. */
/* 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;
+#endif
return 0;
}
changequote([,])dnl
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- locale-fr.m4 and Bionic,
Bruno Haible <=