[PATCH] langinfo: fix up previous patch

[Eric Blake]

* m4/langinfo_h.m4 (gl_LANGINFO_H_DEFAULTS): Set sane defaults.
(gl_LANGINFO_H): Set actual strings on negative tests.
Reported by Tom G. Christensen.

Signed-off-by: Eric Blake <address@hidden>
---

I think this fixes it, but I ran out of time to test it for now.

 ChangeLog        |    7 +++++++
 m4/langinfo_h.m4 |   18 +++++++++---------
 2 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b4a56be..8e21c81 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2010-09-10  Eric Blake  <address@hidden>
+
+       langinfo: fix up previous patch
+       * m4/langinfo_h.m4 (gl_LANGINFO_H_DEFAULTS): Set sane defaults.
+       (gl_LANGINFO_H): Set actual strings on negative tests.
+       Reported by Tom G. Christensen.
+
 2010-09-10  Bruno Haible  <address@hidden>

        relocatable-prog-wrapper: Fix compilation failure due to O_EXEC.
diff --git a/m4/langinfo_h.m4 b/m4/langinfo_h.m4
index c5824c6..f92b555 100644
--- a/m4/langinfo_h.m4
+++ b/m4/langinfo_h.m4
@@ -1,4 +1,4 @@
-# langinfo_h.m4 serial 7
+# langinfo_h.m4 serial 8
 dnl Copyright (C) 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,
@@ -43,8 +43,8 @@ int a = T_FMT_AMPM;
          [gl_cv_header_langinfo_t_fmt_ampm=yes],
          [gl_cv_header_langinfo_t_fmt_ampm=no])
       ])
-    if test $gl_cv_header_langinfo_t_fmt_ampm = yes; then
-      HAVE_LANGINFO_T_FMT_AMPM=1
+    if test $gl_cv_header_langinfo_t_fmt_ampm != yes; then
+      HAVE_LANGINFO_T_FMT_AMPM=0
     fi
     AC_CACHE_CHECK([whether langinfo.h defines ERA],
       [gl_cv_header_langinfo_era],
@@ -67,17 +67,15 @@ int a = YESEXPR;
          [gl_cv_header_langinfo_yesexpr=yes],
          [gl_cv_header_langinfo_yesexpr=no])
       ])
-    if test $gl_cv_header_langinfo_yesexpr = yes; then
-      HAVE_LANGINFO_YESEXPR=1
+    if test $gl_cv_header_langinfo_yesexpr != yes; then
+      HAVE_LANGINFO_YESEXPR=0
     fi
   else
     HAVE_LANGINFO_H=0
   fi
   AC_SUBST([HAVE_LANGINFO_H])
   AC_SUBST([HAVE_LANGINFO_CODESET])
-  AC_SUBST([HAVE_LANGINFO_T_FMT_AMPM])
   AC_SUBST([HAVE_LANGINFO_ERA])
-  AC_SUBST([HAVE_LANGINFO_YESEXPR])

   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
@@ -96,8 +94,10 @@ AC_DEFUN([gl_LANGINFO_MODULE_INDICATOR],

 AC_DEFUN([gl_LANGINFO_H_DEFAULTS],
 [
-  GNULIB_NL_LANGINFO=0;  AC_SUBST([GNULIB_NL_LANGINFO])
+  GNULIB_NL_LANGINFO=0;       AC_SUBST([GNULIB_NL_LANGINFO])
   dnl Assume proper GNU behavior unless another module says otherwise.
-  HAVE_NL_LANGINFO=1;    AC_SUBST([HAVE_NL_LANGINFO])
+  HAVE_NL_LANGINFO=1;         AC_SUBST([HAVE_NL_LANGINFO])
+  HAVE_LANGINFO_T_FMT_AMPM=1; AC_SUBST([HAVE_LANGINFO_T_FMT_AMPM])
+  HAVE_LANGINFO_YESEXPR=1;    AC_SUBST([HAVE_LANGINFO_YESEXPR])
   REPLACE_NL_LANGINFO=0; AC_SUBST([REPLACE_NL_LANGINFO])
 ])
-- 
1.7.2.2