summaryrefslogtreecommitdiff
path: root/gnulib-m4/locale_h.m4
diff options
context:
space:
mode:
authorStephen Kitt <skitt@debian.org>2016-05-27 10:11:04 +0200
committerManuel A. Fernandez Montecelo <manuel.montezelo@gmail.com>2016-05-27 14:28:33 +0100
commit752fd7247bc223bcea35bd89cf56d1c08ead9ba6 (patch)
treeb4a428f847a963738faaf24c8eff070fdb03a3a5 /gnulib-m4/locale_h.m4
parent9f7d4fa477ff2a51d7c932b13d57ac22dc033105 (diff)
parenta9a31b1de5776a3b08a82101a4fa711294f0dd1d (diff)
Imported Debian patch 0.9.6+really0.9.3-0.1debian/0.9.6+really0.9.3-0.1
Diffstat (limited to 'gnulib-m4/locale_h.m4')
-rw-r--r--gnulib-m4/locale_h.m480
1 files changed, 25 insertions, 55 deletions
diff --git a/gnulib-m4/locale_h.m4 b/gnulib-m4/locale_h.m4
index 0d7bb34a..18a119b8 100644
--- a/gnulib-m4/locale_h.m4
+++ b/gnulib-m4/locale_h.m4
@@ -1,5 +1,5 @@
-# locale_h.m4 serial 19
-dnl Copyright (C) 2007, 2009-2015 Free Software Foundation, Inc.
+# locale_h.m4 serial 10
+dnl Copyright (C) 2007, 2009-2010 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.
@@ -10,30 +10,16 @@ AC_DEFUN([gl_LOCALE_H],
dnl once only, before all statements that occur in other macros.
AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
- dnl Persuade glibc <locale.h> to define locale_t and the int_p_*, int_n_*
- dnl members of 'struct lconv'.
+ dnl Persuade glibc <locale.h> to define locale_t.
AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
dnl If <stddef.h> is replaced, then <locale.h> must also be replaced.
AC_REQUIRE([gl_STDDEF_H])
- dnl Solaris 11 2011-11 defines the int_p_*, int_n_* members of 'struct lconv'
- dnl only if _LCONV_C99 is defined.
- AC_REQUIRE([AC_CANONICAL_HOST])
- case "$host_os" in
- solaris*)
- AC_DEFINE([_LCONV_C99], [1], [Define to 1 on Solaris.])
- ;;
- esac
-
AC_CACHE_CHECK([whether locale.h conforms to POSIX:2001],
[gl_cv_header_locale_h_posix2001],
- [AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <locale.h>
- int x = LC_MESSAGES;
- int y = sizeof (((struct lconv *) 0)->decimal_point);]],
- [[]])],
+ [AC_TRY_COMPILE([#include <locale.h>
+int x = LC_MESSAGES;], [],
[gl_cv_header_locale_h_posix2001=yes],
[gl_cv_header_locale_h_posix2001=no])])
@@ -42,15 +28,12 @@ AC_DEFUN([gl_LOCALE_H],
if test $ac_cv_header_xlocale_h = yes; then
HAVE_XLOCALE_H=1
dnl Check whether use of locale_t requires inclusion of <xlocale.h>,
- dnl e.g. on Mac OS X 10.5. If <locale.h> does not define locale_t by
+ dnl e.g. on MacOS X 10.5. If <locale.h> does not define locale_t by
dnl itself, we assume that <xlocale.h> will do so.
AC_CACHE_CHECK([whether locale.h defines locale_t],
[gl_cv_header_locale_has_locale_t],
- [AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <locale.h>
- locale_t x;]],
- [[]])],
+ [AC_TRY_COMPILE([#include <locale.h>
+locale_t x;], [],
[gl_cv_header_locale_has_locale_t=yes],
[gl_cv_header_locale_has_locale_t=no])
])
@@ -65,28 +48,14 @@ AC_DEFUN([gl_LOCALE_H],
fi
AC_SUBST([HAVE_XLOCALE_H])
- dnl Check whether 'struct lconv' is complete.
- dnl Bionic libc's 'struct lconv' is just a dummy.
- dnl On OpenBSD 4.9, HP-UX 11, IRIX 6.5, OSF/1 5.1, Solaris 9, Cygwin 1.5.x,
- dnl mingw, MSVC 9, it lacks the int_p_* and int_n_* members.
- AC_CACHE_CHECK([whether struct lconv is properly defined],
- [gl_cv_sys_struct_lconv_ok],
- [AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[#include <locale.h>
- struct lconv l;
- int x = sizeof (l.decimal_point);
- int y = sizeof (l.int_p_cs_precedes);]],
- [[]])],
- [gl_cv_sys_struct_lconv_ok=yes],
- [gl_cv_sys_struct_lconv_ok=no])
- ])
- if test $gl_cv_sys_struct_lconv_ok = no; then
- REPLACE_STRUCT_LCONV=1
- fi
-
dnl <locale.h> is always overridden, because of GNULIB_POSIXCHECK.
- gl_NEXT_HEADERS([locale.h])
+ gl_CHECK_NEXT_HEADERS([locale.h])
+
+ if test -n "$STDDEF_H" \
+ || test $gl_cv_header_locale_h_posix2001 = no \
+ || test $gl_cv_header_locale_h_needs_xlocale_h = yes; then
+ gl_REPLACE_LOCALE_H
+ fi
dnl Check for declarations of anything we want to poison if the
dnl corresponding gnulib module is not in use.
@@ -95,8 +64,14 @@ AC_DEFUN([gl_LOCALE_H],
#if HAVE_XLOCALE_H
# include <xlocale.h>
#endif
- ]],
- [setlocale duplocale])
+ ]], [duplocale])
+])
+
+dnl Unconditionally enables the replacement of <locale.h>.
+AC_DEFUN([gl_REPLACE_LOCALE_H],
+[
+ dnl This is a no-op, because <locale.h> is always overridden.
+ :
])
AC_DEFUN([gl_LOCALE_MODULE_INDICATOR],
@@ -110,13 +85,8 @@ AC_DEFUN([gl_LOCALE_MODULE_INDICATOR],
AC_DEFUN([gl_LOCALE_H_DEFAULTS],
[
- GNULIB_LOCALECONV=0; AC_SUBST([GNULIB_LOCALECONV])
- GNULIB_SETLOCALE=0; AC_SUBST([GNULIB_SETLOCALE])
GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE])
dnl Assume proper GNU behavior unless another module says otherwise.
- HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE])
- REPLACE_LOCALECONV=0; AC_SUBST([REPLACE_LOCALECONV])
- REPLACE_SETLOCALE=0; AC_SUBST([REPLACE_SETLOCALE])
- REPLACE_DUPLOCALE=0; AC_SUBST([REPLACE_DUPLOCALE])
- REPLACE_STRUCT_LCONV=0; AC_SUBST([REPLACE_STRUCT_LCONV])
+ HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE])
+ REPLACE_DUPLOCALE=0; AC_SUBST([REPLACE_DUPLOCALE])
])