4a626d0a0f
2015-08-24 Pedro Alves <palves@redhat.com> * gnulib/update-gnulib.sh (GNULIB_COMMIT_SHA1): Set to 1029a8112290f6eee9d7878a391c49db42c999bd. * gnulib/configure, gnulib/config.in, gnulib/aclocal.m4: Regenerate. * gnulib/import/Makefile.am: Update. * gnulib/import/Makefile.in: Update. * gnulib/import/alloca.in.h: Update. * gnulib/import/basename-lgpl.c: Update. * gnulib/import/canonicalize-lgpl.c: Update. * gnulib/import/config.charset: Update. * gnulib/import/dirent.in.h: Update. * gnulib/import/dirfd.c: Update. * gnulib/import/dirname-lgpl.c: Update. * gnulib/import/dirname.h: Update. * gnulib/import/dosname.h: Update. * gnulib/import/errno.in.h: Update. * gnulib/import/extra/snippet/arg-nonnull.h: Update. * gnulib/import/extra/snippet/c++defs.h: Update. * gnulib/import/extra/snippet/warn-on-use.h: Update. * gnulib/import/extra/update-copyright: Update. * gnulib/import/float+.h: Update. * gnulib/import/float.c: Update. * gnulib/import/float.in.h: Update. * gnulib/import/fnmatch.c: Update. * gnulib/import/fnmatch.in.h: Update. * gnulib/import/fnmatch_loop.c: Update. * gnulib/import/fpucw.h: Update. * gnulib/import/frexp.c: Update. * gnulib/import/frexpl.c: Update. * gnulib/import/gettimeofday.c: Update. * gnulib/import/inttypes.in.h: Update. * gnulib/import/isnan.c: Update. * gnulib/import/isnand-nolibm.h: Update. * gnulib/import/isnand.c: Update. * gnulib/import/isnanl-nolibm.h: Update. * gnulib/import/isnanl.c: Update. * gnulib/import/itold.c: Update. * gnulib/import/localcharset.c: Update. * gnulib/import/localcharset.h: Update. * gnulib/import/lstat.c: Update. * gnulib/import/m4/00gnulib.m4: Update. * gnulib/import/m4/absolute-header.m4: Update. * gnulib/import/m4/alloca.m4: Update. * gnulib/import/m4/canonicalize.m4: Update. * gnulib/import/m4/codeset.m4: Update. * gnulib/import/m4/configmake.m4: Update. * gnulib/import/m4/dirent_h.m4: Update. * gnulib/import/m4/dirfd.m4: Update. * gnulib/import/m4/dirname.m4: Update. * gnulib/import/m4/double-slash-root.m4: Update. * gnulib/import/m4/eealloc.m4: Update. * gnulib/import/m4/errno_h.m4: Update. * gnulib/import/m4/exponentd.m4: Update. * gnulib/import/m4/exponentl.m4: Update. * gnulib/import/m4/extensions.m4: Update. * gnulib/import/m4/extern-inline.m4: Update. * gnulib/import/m4/fcntl-o.m4: Update. * gnulib/import/m4/float_h.m4: Update. * gnulib/import/m4/fnmatch.m4: Update. * gnulib/import/m4/fpieee.m4: Update. * gnulib/import/m4/frexp.m4: Update. * gnulib/import/m4/frexpl.m4: Update. * gnulib/import/m4/gettimeofday.m4: Update. * gnulib/import/m4/glibc21.m4: Update. * gnulib/import/m4/gnulib-cache.m4: Update. * gnulib/import/m4/gnulib-common.m4: Update. * gnulib/import/m4/gnulib-comp.m4: Update. * gnulib/import/m4/gnulib-tool.m4: Update. * gnulib/import/m4/include_next.m4: Update. * gnulib/import/m4/inttypes-pri.m4: Update. * gnulib/import/m4/inttypes.m4: Update. * gnulib/import/m4/isnand.m4: Update. * gnulib/import/m4/isnanl.m4: Update. * gnulib/import/m4/largefile.m4: Update. * gnulib/import/m4/localcharset.m4: Update. * gnulib/import/m4/locale-fr.m4: Update. * gnulib/import/m4/locale-ja.m4: Update. * gnulib/import/m4/locale-zh.m4: Update. * gnulib/import/m4/longlong.m4: Update. * gnulib/import/m4/lstat.m4: Update. * gnulib/import/m4/malloc.m4: Update. * gnulib/import/m4/malloca.m4: Update. * gnulib/import/m4/math_h.m4: Update. * gnulib/import/m4/mbrtowc.m4: Update. * gnulib/import/m4/mbsinit.m4: Update. * gnulib/import/m4/mbsrtowcs.m4: Update. * gnulib/import/m4/mbstate_t.m4: Update. * gnulib/import/m4/memchr.m4: Update. * gnulib/import/m4/memmem.m4: Update. * gnulib/import/m4/mmap-anon.m4: Update. * gnulib/import/m4/multiarch.m4: Update. * gnulib/import/m4/nocrash.m4: Update. * gnulib/import/m4/off_t.m4: Update. * gnulib/import/m4/pathmax.m4: Update. * gnulib/import/m4/readlink.m4: Update. * gnulib/import/m4/rename.m4: Update. * gnulib/import/m4/rmdir.m4: Update. * gnulib/import/m4/ssize_t.m4: Update. * gnulib/import/m4/stat.m4: Update. * gnulib/import/m4/stdbool.m4: Update. * gnulib/import/m4/stddef_h.m4: Update. * gnulib/import/m4/stdint.m4: Update. * gnulib/import/m4/stdio_h.m4: Update. * gnulib/import/m4/stdlib_h.m4: Update. * gnulib/import/m4/string_h.m4: Update. * gnulib/import/m4/strstr.m4: Update. * gnulib/import/m4/strtok_r.m4: Update. * gnulib/import/m4/sys_socket_h.m4: Update. * gnulib/import/m4/sys_stat_h.m4: Update. * gnulib/import/m4/sys_time_h.m4: Update. * gnulib/import/m4/sys_types_h.m4: Update. * gnulib/import/m4/time_h.m4: Update. * gnulib/import/m4/unistd_h.m4: Update. * gnulib/import/m4/warn-on-use.m4: Update. * gnulib/import/m4/wchar_h.m4: Update. * gnulib/import/m4/wchar_t.m4: Update. * gnulib/import/m4/wctype_h.m4: Update. * gnulib/import/m4/wint_t.m4: Update. * gnulib/import/malloc.c: Update. * gnulib/import/malloca.c: Update. * gnulib/import/malloca.h: Update. * gnulib/import/math.in.h: Update. * gnulib/import/mbrtowc.c: Update. * gnulib/import/mbsinit.c: Update. * gnulib/import/mbsrtowcs-impl.h: Update. * gnulib/import/mbsrtowcs-state.c: Update. * gnulib/import/mbsrtowcs.c: Update. * gnulib/import/memchr.c: Update. * gnulib/import/memmem.c: Update. * gnulib/import/pathmax.h: Update. * gnulib/import/readlink.c: Update. * gnulib/import/ref-add.sin: Update. * gnulib/import/ref-del.sin: Update. * gnulib/import/rename.c: Update. * gnulib/import/rmdir.c: Update. * gnulib/import/same-inode.h: Update. * gnulib/import/stat.c: Update. * gnulib/import/stdbool.in.h: Update. * gnulib/import/stddef.in.h: Update. * gnulib/import/stdint.in.h: Update. * gnulib/import/stdio.c: Update. * gnulib/import/stdio.in.h: Update. * gnulib/import/stdlib.in.h: Update. * gnulib/import/str-two-way.h: Update. * gnulib/import/streq.h: Update. * gnulib/import/string.in.h: Update. * gnulib/import/stripslash.c: Update. * gnulib/import/strnlen1.c: Update. * gnulib/import/strnlen1.h: Update. * gnulib/import/strstr.c: Update. * gnulib/import/strtok_r.c: Update. * gnulib/import/sys_stat.in.h: Update. * gnulib/import/sys_time.in.h: Update. * gnulib/import/sys_types.in.h: Update. * gnulib/import/time.in.h: Update. * gnulib/import/unistd.in.h: Update. * gnulib/import/verify.h: Update. * gnulib/import/wchar.in.h: Update. * gnulib/import/wctype.in.h: Update. * gnulib/import/gettimeofday.c: New file. * gnulib/import/m4/absolute-header.m4: New file. * gnulib/import/m4/gettimeofday.m4: New file. * gnulib/import/m4/sys_socket_h.m4: New file. * gnulib/import/m4/sys_time_h.m4: New file. * gnulib/import/stdio.c: Delete file. * gnulib/import/sys_time.in.h: New file.
250 lines
10 KiB
Text
250 lines
10 KiB
Text
# locale-fr.m4 serial 17
|
|
dnl Copyright (C) 2003, 2005-2015 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.
|
|
|
|
dnl From Bruno Haible.
|
|
|
|
dnl Determine the name of a french locale with traditional encoding.
|
|
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_LANG_CONFTEST([AC_LANG_SOURCE([
|
|
changequote(,)dnl
|
|
#include <locale.h>
|
|
#include <time.h>
|
|
#if HAVE_LANGINFO_CODESET
|
|
# include <langinfo.h>
|
|
#endif
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
struct tm t;
|
|
char buf[16];
|
|
int main () {
|
|
/* Check whether the given locale name is recognized by the system. */
|
|
#if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
|
|
/* On native Windows, setlocale(category, "") looks at the system settings,
|
|
not at the environment variables. Also, when an encoding suffix such
|
|
as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
|
|
category of the locale to "C". */
|
|
if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
|
|
|| strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
|
|
return 1;
|
|
#else
|
|
if (setlocale (LC_ALL, "") == NULL) return 1;
|
|
#endif
|
|
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
|
|
On Mac OS 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 situation,
|
|
some unit tests fail.
|
|
On MirBSD 10, when an unsupported locale is specified, setlocale()
|
|
succeeds but then nl_langinfo(CODESET) is "UTF-8". */
|
|
#if HAVE_LANGINFO_CODESET
|
|
{
|
|
const char *cs = nl_langinfo (CODESET);
|
|
if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0
|
|
|| strcmp (cs, "UTF-8") == 0)
|
|
return 1;
|
|
}
|
|
#endif
|
|
#ifdef __CYGWIN__
|
|
/* On Cygwin, avoid locale names without encoding suffix, because the
|
|
locale_charset() function relies on the encoding suffix. Note that
|
|
LC_ALL is set on the command line. */
|
|
if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
|
|
#endif
|
|
/* Check whether in the abbreviation of the second month, the second
|
|
character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is only
|
|
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
|
|
])])
|
|
if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
|
|
case "$host_os" in
|
|
# Handle native Windows specially, because there setlocale() interprets
|
|
# "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
|
|
# "fr" or "fra" as "French" or "French_France.1252",
|
|
# "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
|
|
# "ja" as "Japanese" or "Japanese_Japan.932",
|
|
# and similar.
|
|
mingw*)
|
|
# Test for the native Windows locale name.
|
|
if (LC_ALL=French_France.1252 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
|
|
gt_cv_locale_fr=French_France.1252
|
|
else
|
|
# None found.
|
|
gt_cv_locale_fr=none
|
|
fi
|
|
;;
|
|
*)
|
|
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
|
|
# otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
|
|
# configure script would override the LC_ALL setting. Likewise for
|
|
# LC_CTYPE, which is also set at the beginning of the configure script.
|
|
# Test for the usual locale name.
|
|
if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
|
|
gt_cv_locale_fr=fr_FR
|
|
else
|
|
# Test for the locale name with explicit encoding suffix.
|
|
if (LC_ALL=fr_FR.ISO-8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
|
|
gt_cv_locale_fr=fr_FR.ISO-8859-1
|
|
else
|
|
# Test for the AIX, OSF/1, FreeBSD, NetBSD, OpenBSD locale name.
|
|
if (LC_ALL=fr_FR.ISO8859-1 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
|
|
gt_cv_locale_fr=fr_FR.ISO8859-1
|
|
else
|
|
# Test for the HP-UX locale name.
|
|
if (LC_ALL=fr_FR.iso88591 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
|
|
gt_cv_locale_fr=fr_FR.iso88591
|
|
else
|
|
# Test for the Solaris 7 locale name.
|
|
if (LC_ALL=fr LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
|
|
gt_cv_locale_fr=fr
|
|
else
|
|
# None found.
|
|
gt_cv_locale_fr=none
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
fi
|
|
;;
|
|
esac
|
|
fi
|
|
rm -fr conftest*
|
|
])
|
|
LOCALE_FR=$gt_cv_locale_fr
|
|
AC_SUBST([LOCALE_FR])
|
|
])
|
|
|
|
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_LANG_CONFTEST([AC_LANG_SOURCE([
|
|
changequote(,)dnl
|
|
#include <locale.h>
|
|
#include <time.h>
|
|
#if HAVE_LANGINFO_CODESET
|
|
# include <langinfo.h>
|
|
#endif
|
|
#include <stdlib.h>
|
|
#include <string.h>
|
|
struct tm t;
|
|
char buf[16];
|
|
int main () {
|
|
/* 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__ || defined __HAIKU__)
|
|
/* Check whether the given locale name is recognized by the system. */
|
|
# if (defined _WIN32 || defined __WIN32__) && !defined __CYGWIN__
|
|
/* On native Windows, setlocale(category, "") looks at the system settings,
|
|
not at the environment variables. Also, when an encoding suffix such
|
|
as ".65001" or ".54936" is specified, it succeeds but sets the LC_CTYPE
|
|
category of the locale to "C". */
|
|
if (setlocale (LC_ALL, getenv ("LC_ALL")) == NULL
|
|
|| strcmp (setlocale (LC_CTYPE, NULL), "C") == 0)
|
|
return 1;
|
|
# else
|
|
if (setlocale (LC_ALL, "") == NULL) return 1;
|
|
# endif
|
|
/* Check whether nl_langinfo(CODESET) is nonempty and not "ASCII" or "646".
|
|
On Mac OS 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 situation,
|
|
some unit tests fail. */
|
|
# if HAVE_LANGINFO_CODESET
|
|
{
|
|
const char *cs = nl_langinfo (CODESET);
|
|
if (cs[0] == '\0' || strcmp (cs, "ASCII") == 0 || strcmp (cs, "646") == 0)
|
|
return 1;
|
|
}
|
|
# endif
|
|
# ifdef __CYGWIN__
|
|
/* On Cygwin, avoid locale names without encoding suffix, because the
|
|
locale_charset() function relies on the encoding suffix. Note that
|
|
LC_ALL is set on the command line. */
|
|
if (strchr (getenv ("LC_ALL"), '.') == NULL) return 1;
|
|
# endif
|
|
/* Check whether in the abbreviation of the second month, the second
|
|
character (should be U+00E9: LATIN SMALL LETTER E WITH ACUTE) is
|
|
two bytes long, with UTF-8 encoding. */
|
|
t.tm_year = 1975 - 1900; t.tm_mon = 2 - 1; t.tm_mday = 4;
|
|
if (strftime (buf, sizeof (buf), "%b", &t) < 4
|
|
|| 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
|
|
])])
|
|
if AC_TRY_EVAL([ac_link]) && test -s conftest$ac_exeext; then
|
|
case "$host_os" in
|
|
# Handle native Windows specially, because there setlocale() interprets
|
|
# "ar" as "Arabic" or "Arabic_Saudi Arabia.1256",
|
|
# "fr" or "fra" as "French" or "French_France.1252",
|
|
# "ge"(!) or "deu"(!) as "German" or "German_Germany.1252",
|
|
# "ja" as "Japanese" or "Japanese_Japan.932",
|
|
# and similar.
|
|
mingw*)
|
|
# Test for the hypothetical native Windows locale name.
|
|
if (LC_ALL=French_France.65001 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
|
|
gt_cv_locale_fr_utf8=French_France.65001
|
|
else
|
|
# None found.
|
|
gt_cv_locale_fr_utf8=none
|
|
fi
|
|
;;
|
|
*)
|
|
# Setting LC_ALL is not enough. Need to set LC_TIME to empty, because
|
|
# otherwise on Mac OS X 10.3.5 the LC_TIME=C from the beginning of the
|
|
# configure script would override the LC_ALL setting. Likewise for
|
|
# LC_CTYPE, which is also set at the beginning of the configure script.
|
|
# Test for the usual locale name.
|
|
if (LC_ALL=fr_FR LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
|
|
gt_cv_locale_fr_utf8=fr_FR
|
|
else
|
|
# Test for the locale name with explicit encoding suffix.
|
|
if (LC_ALL=fr_FR.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
|
|
gt_cv_locale_fr_utf8=fr_FR.UTF-8
|
|
else
|
|
# Test for the Solaris 7 locale name.
|
|
if (LC_ALL=fr.UTF-8 LC_TIME= LC_CTYPE= ./conftest; exit) 2>/dev/null; then
|
|
gt_cv_locale_fr_utf8=fr.UTF-8
|
|
else
|
|
# None found.
|
|
gt_cv_locale_fr_utf8=none
|
|
fi
|
|
fi
|
|
fi
|
|
;;
|
|
esac
|
|
fi
|
|
rm -fr conftest*
|
|
])
|
|
LOCALE_FR_UTF8=$gt_cv_locale_fr_utf8
|
|
AC_SUBST([LOCALE_FR_UTF8])
|
|
])
|