summaryrefslogtreecommitdiff
path: root/modules/langinfo
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2010-09-10 20:23:49 +0200
committerBruno Haible <bruno@clisp.org>2010-09-10 20:23:49 +0200
commit3f322af6c93f7eb4c6ce5ceb789416aae10a50bd (patch)
tree2e7a6424f9a9e2848cf7e1aa647735b41c0e26ac /modules/langinfo
parentcc85acd7729af217a8f4820ecb36a9be816dba75 (diff)
downloadgnulib-3f322af6c93f7eb4c6ce5ceb789416aae10a50bd.tar.gz
langinfo, nl_langinfo: Fix for IRIX 5.3.
* m4/langinfo_h.m4 (gl_LANGINFO_H): Test whether langinfo.h defines T_FMT_AMPM, YESEXPR. Set HAVE_LANGINFO_T_FMT_AMPM, HAVE_LANGINFO_YESEXPR. * modules/langinfo (Makefile.am): Substitute HAVE_LANGINFO_T_FMT_AMPM, HAVE_LANGINFO_YESEXPR. * lib/langinfo.in.h (T_FMT_AMPM, GNULIB_defined_T_FMT_AMPM): Define if HAVE_LANGINFO_T_FMT_AMPM is 0. (YESEXPR, NOEXPR, GNULIB_defined_YESEXPR): Define if HAVE_LANGINFO_YESEXPR is 0. * lib/nl_langinfo.c (rpl_nl_langinfo): Handle also T_FMT_AMPM, YESEXPR, NOEXPR. * doc/posix-headers/langinfo.texi: Mention the IRIX 5.3 problem. * doc/posix-functions/nl_langinfo.texi: Likewise. Reported by Eric Blake.
Diffstat (limited to 'modules/langinfo')
-rw-r--r--modules/langinfo2
1 files changed, 2 insertions, 0 deletions
diff --git a/modules/langinfo b/modules/langinfo
index c7f545e7bc..b6f5373d7c 100644
--- a/modules/langinfo
+++ b/modules/langinfo
@@ -28,7 +28,9 @@ langinfo.h: langinfo.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
-e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
-e 's|@''GNULIB_NL_LANGINFO''@|$(GNULIB_NL_LANGINFO)|g' \
-e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
+ -e 's|@''HAVE_LANGINFO_T_FMT_AMPM''@|$(HAVE_LANGINFO_T_FMT_AMPM)|g' \
-e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
+ -e 's|@''HAVE_LANGINFO_YESEXPR''@|$(HAVE_LANGINFO_YESEXPR)|g' \
-e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
-e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
-e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \