locale_h.m4		locale_h.m4
	# locale_h.m4 serial 10		# locale_h.m4 serial 19
	dnl Copyright (C) 2007, 2009-2010 Free Software Foundation, Inc.		dnl Copyright (C) 2007, 2009-2014 Free Software Foundation, Inc.
	dnl This file is free software; the Free Software Foundation		dnl This file is free software; the Free Software Foundation
	dnl gives unlimited permission to copy and/or distribute it,		dnl gives unlimited permission to copy and/or distribute it,
	dnl with or without modifications, as long as this notice is preserved.		dnl with or without modifications, as long as this notice is preserved.
	AC_DEFUN([gl_LOCALE_H],		AC_DEFUN([gl_LOCALE_H],
	[		[
	dnl Use AC_REQUIRE here, so that the default behavior below is expanded		dnl Use AC_REQUIRE here, so that the default behavior below is expanded
	dnl once only, before all statements that occur in other macros.		dnl once only, before all statements that occur in other macros.
	AC_REQUIRE([gl_LOCALE_H_DEFAULTS])		AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
	dnl Persuade glibc <locale.h> to define locale_t.		dnl Persuade glibc <locale.h> to define locale_t and the int_p_*, int_n_*
			dnl members of 'struct lconv'.
	AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])		AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
	dnl If <stddef.h> is replaced, then <locale.h> must also be replaced.		dnl If <stddef.h> is replaced, then <locale.h> must also be replaced.
	AC_REQUIRE([gl_STDDEF_H])		AC_REQUIRE([gl_STDDEF_H])
			dnl Solaris 11 2011-11 defines the int_p_*, int_n_* members of 'struct lc
			onv'
			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],		AC_CACHE_CHECK([whether locale.h conforms to POSIX:2001],
	[gl_cv_header_locale_h_posix2001],		[gl_cv_header_locale_h_posix2001],
	[AC_TRY_COMPILE([#include <locale.h>		[AC_COMPILE_IFELSE(
	int x = LC_MESSAGES;], [],		[AC_LANG_PROGRAM(
			[[#include <locale.h>
			int x = LC_MESSAGES;
			int y = sizeof (((struct lconv *) 0)->decimal_point);]],
			[[]])],
	[gl_cv_header_locale_h_posix2001=yes],		[gl_cv_header_locale_h_posix2001=yes],
	[gl_cv_header_locale_h_posix2001=no])])		[gl_cv_header_locale_h_posix2001=no])])
	dnl Check for <xlocale.h>.		dnl Check for <xlocale.h>.
	AC_CHECK_HEADERS_ONCE([xlocale.h])		AC_CHECK_HEADERS_ONCE([xlocale.h])
	if test $ac_cv_header_xlocale_h = yes; then		if test $ac_cv_header_xlocale_h = yes; then
	HAVE_XLOCALE_H=1		HAVE_XLOCALE_H=1
	dnl Check whether use of locale_t requires inclusion of <xlocale.h>,		dnl Check whether use of locale_t requires inclusion of <xlocale.h>,
	dnl e.g. on MacOS X 10.5. If <locale.h> does not define locale_t by		dnl e.g. on Mac OS X 10.5. If <locale.h> does not define locale_t by
	dnl itself, we assume that <xlocale.h> will do so.		dnl itself, we assume that <xlocale.h> will do so.
	AC_CACHE_CHECK([whether locale.h defines locale_t],		AC_CACHE_CHECK([whether locale.h defines locale_t],
	[gl_cv_header_locale_has_locale_t],		[gl_cv_header_locale_has_locale_t],
	[AC_TRY_COMPILE([#include <locale.h>		[AC_COMPILE_IFELSE(
	locale_t x;], [],		[AC_LANG_PROGRAM(
			[[#include <locale.h>
			locale_t x;]],
			[[]])],
	[gl_cv_header_locale_has_locale_t=yes],		[gl_cv_header_locale_has_locale_t=yes],
	[gl_cv_header_locale_has_locale_t=no])		[gl_cv_header_locale_has_locale_t=no])
	])		])
	if test $gl_cv_header_locale_has_locale_t = yes; then		if test $gl_cv_header_locale_has_locale_t = yes; then
	gl_cv_header_locale_h_needs_xlocale_h=no		gl_cv_header_locale_h_needs_xlocale_h=no
	else		else
	gl_cv_header_locale_h_needs_xlocale_h=yes		gl_cv_header_locale_h_needs_xlocale_h=yes
	fi		fi
	else		else
	HAVE_XLOCALE_H=0		HAVE_XLOCALE_H=0
	gl_cv_header_locale_h_needs_xlocale_h=no		gl_cv_header_locale_h_needs_xlocale_h=no
	fi		fi
	AC_SUBST([HAVE_XLOCALE_H])		AC_SUBST([HAVE_XLOCALE_H])
	dnl <locale.h> is always overridden, because of GNULIB_POSIXCHECK.		dnl Check whether 'struct lconv' is complete.
	gl_CHECK_NEXT_HEADERS([locale.h])		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.
	if test -n "$STDDEF_H" \		x,
	|| test $gl_cv_header_locale_h_posix2001 = no \		dnl mingw, MSVC 9, it lacks the int_p_* and int_n_* members.
	|| test $gl_cv_header_locale_h_needs_xlocale_h = yes; then		AC_CACHE_CHECK([whether struct lconv is properly defined],
	gl_REPLACE_LOCALE_H		[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		fi
			dnl <locale.h> is always overridden, because of GNULIB_POSIXCHECK.
			gl_NEXT_HEADERS([locale.h])
	dnl Check for declarations of anything we want to poison if the		dnl Check for declarations of anything we want to poison if the
	dnl corresponding gnulib module is not in use.		dnl corresponding gnulib module is not in use.
	gl_WARN_ON_USE_PREPARE([[#include <locale.h>		gl_WARN_ON_USE_PREPARE([[#include <locale.h>
	/* Some systems provide declarations in a non-standard header. */		/* Some systems provide declarations in a non-standard header. */
	#if HAVE_XLOCALE_H		#if HAVE_XLOCALE_H
	# include <xlocale.h>		# include <xlocale.h>
	#endif		#endif
	]], [duplocale])		]],
	])		[setlocale 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],		AC_DEFUN([gl_LOCALE_MODULE_INDICATOR],
	[		[
	dnl Use AC_REQUIRE here, so that the default settings are expanded once o nly.		dnl Use AC_REQUIRE here, so that the default settings are expanded once o nly.
	AC_REQUIRE([gl_LOCALE_H_DEFAULTS])		AC_REQUIRE([gl_LOCALE_H_DEFAULTS])
	gl_MODULE_INDICATOR_SET_VARIABLE([$1])		gl_MODULE_INDICATOR_SET_VARIABLE([$1])
	dnl Define it also as a C macro, for the benefit of the unit tests.		dnl Define it also as a C macro, for the benefit of the unit tests.
	gl_MODULE_INDICATOR_FOR_TESTS([$1])		gl_MODULE_INDICATOR_FOR_TESTS([$1])
	])		])
	AC_DEFUN([gl_LOCALE_H_DEFAULTS],		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])		GNULIB_DUPLOCALE=0; AC_SUBST([GNULIB_DUPLOCALE])
	dnl Assume proper GNU behavior unless another module says otherwise.		dnl Assume proper GNU behavior unless another module says otherwise.
	HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE])		HAVE_DUPLOCALE=1; AC_SUBST([HAVE_DUPLOCALE])
	REPLACE_DUPLOCALE=0; AC_SUBST([REPLACE_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])
	])		])
End of changes. 11 change blocks.
	25 lines changed or deleted		57 lines changed or added
This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/