From: Bruno Haible <bruno@clisp.org>
Date: Thu, 7 Jan 2010 20:25:30 +0000 (+0100)
Subject: nl_langinfo: Simplify logic.
X-Git-Tag: stable/20100109~22
X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=77f03a3c0490ee4c2f5a14e8a7c83e0a80d6e143;p=gnulib.git

nl_langinfo: Simplify logic.
(cherry picked from commit 7f01cc5253fa60903c1963c23c34eb79b1fb4b79)
---

diff --git a/ChangeLog b/ChangeLog
index 81e108b63..a5622985e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2010-01-07  Bruno Haible  <bruno@clisp.org>
+
+	* m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): Simplify logic.
+
 2010-01-07  John W. Eaton  <jwe@octave.org>
 
 	wctype: allow C++ use
diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4
index e13546ba0..ad456a264 100644
--- a/m4/nl_langinfo.m4
+++ b/m4/nl_langinfo.m4
@@ -1,4 +1,4 @@
-# nl_langinfo.m4 serial 2
+# nl_langinfo.m4 serial 3
 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,
@@ -9,8 +9,7 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO],
   AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
   AC_REQUIRE([gl_LANGINFO_H])
   AC_CHECK_FUNCS_ONCE([nl_langinfo])
-  if test $HAVE_LANGINFO_H = 1 \
-     && test x$ac_cv_func_nl_langinfo = xyes; then
+  if test $ac_cv_func_nl_langinfo = yes; then
     if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1; then
       :
     else