comparison m4/nl_langinfo.m4 @ 39243:6828f5d6f32d

nl_langinfo: Override the system's nl_langinfo() when needed. Reported by Jim Meyering. * m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): Set REPLACE_NL_LANGINFO=1 also when HAVE_LANGINFO_T_FMT_AMPM or HAVE_LANGINFO_ALTMON is 0.
author Bruno Haible <bruno@clisp.org>
date Sun, 04 Feb 2018 11:00:38 +0100
parents 24e347e0e326
children b06060465f09
comparison
equal deleted inserted replaced
39242:a34ab07b1471 39243:6828f5d6f32d
1 # nl_langinfo.m4 serial 5 1 # nl_langinfo.m4 serial 6
2 dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. 2 dnl Copyright (C) 2009-2018 Free Software Foundation, Inc.
3 dnl This file is free software; the Free Software Foundation 3 dnl This file is free software; the Free Software Foundation
4 dnl gives unlimited permission to copy and/or distribute it, 4 dnl gives unlimited permission to copy and/or distribute it,
5 dnl with or without modifications, as long as this notice is preserved. 5 dnl with or without modifications, as long as this notice is preserved.
6 6
34 *) FUNC_NL_LANGINFO_YESEXPR_WORKS=0 ;; 34 *) FUNC_NL_LANGINFO_YESEXPR_WORKS=0 ;;
35 esac 35 esac
36 AC_DEFINE_UNQUOTED([FUNC_NL_LANGINFO_YESEXPR_WORKS], 36 AC_DEFINE_UNQUOTED([FUNC_NL_LANGINFO_YESEXPR_WORKS],
37 [$FUNC_NL_LANGINFO_YESEXPR_WORKS], 37 [$FUNC_NL_LANGINFO_YESEXPR_WORKS],
38 [Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string.]) 38 [Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string.])
39 if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \ 39 if test $HAVE_LANGINFO_CODESET = 1 \
40 && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then 40 && test $HAVE_LANGINFO_T_FMT_AMPM = 1 \
41 && test $HAVE_LANGINFO_ALTMON = 1 \
42 && test $HAVE_LANGINFO_ERA = 1 \
43 && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then
41 : 44 :
42 else 45 else
43 REPLACE_NL_LANGINFO=1 46 REPLACE_NL_LANGINFO=1
44 AC_DEFINE([REPLACE_NL_LANGINFO], [1], 47 AC_DEFINE([REPLACE_NL_LANGINFO], [1],
45 [Define if nl_langinfo exists but is overridden by gnulib.]) 48 [Define if nl_langinfo exists but is overridden by gnulib.])