Mercurial > gnulib
changeset 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 | a34ab07b1471 |
| children | aa3cd60dc529 |
| files | ChangeLog m4/nl_langinfo.m4 |
| diffstat | 2 files changed, 13 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Feb 04 10:42:45 2018 +0100 +++ b/ChangeLog Sun Feb 04 11:00:38 2018 +0100 @@ -1,3 +1,10 @@ +2018-02-04 Bruno Haible <bruno@clisp.org> + + 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. + 2018-02-04 Bruno Haible <bruno@clisp.org> signal-h, monetary, strings: Fix build failure in some cases.
--- a/m4/nl_langinfo.m4 Sun Feb 04 10:42:45 2018 +0100 +++ b/m4/nl_langinfo.m4 Sun Feb 04 11:00:38 2018 +0100 @@ -1,4 +1,4 @@ -# nl_langinfo.m4 serial 5 +# nl_langinfo.m4 serial 6 dnl Copyright (C) 2009-2018 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -36,8 +36,11 @@ AC_DEFINE_UNQUOTED([FUNC_NL_LANGINFO_YESEXPR_WORKS], [$FUNC_NL_LANGINFO_YESEXPR_WORKS], [Define to 1 if nl_langinfo (YESEXPR) returns a non-empty string.]) - if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1 \ - && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then + if test $HAVE_LANGINFO_CODESET = 1 \ + && test $HAVE_LANGINFO_T_FMT_AMPM = 1 \ + && test $HAVE_LANGINFO_ALTMON = 1 \ + && test $HAVE_LANGINFO_ERA = 1 \ + && test $FUNC_NL_LANGINFO_YESEXPR_WORKS = 1; then : else REPLACE_NL_LANGINFO=1