nl_langinfo: do not call AC_CHECK_FUNC_ONCE inside if.

* m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): Do not call
AC_CHECK_FUNC_ONCE inside if, do not adjust ac_cv_func_nl_langinfo.

diff --git a/ChangeLog b/ChangeLog
index ae5e1a0399ce4bdebafbbe55d476f6b0e7ae4e2d..e20f352e780bf9c653ebfa475f0e23b1f599a015 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-01-06  Paolo Bonzini  <bonzini@gnu.org>
+
+       nl_langinfo: do not call AC_CHECK_FUNC_ONCE inside if.
+       * m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): Do not call
+       AC_CHECK_FUNC_ONCE inside if, do not adjust ac_cv_func_nl_langinfo.
+
 2010-01-06  Jim Meyering  <meyering@redhat.com>
 
        readtokens: this module *does* require xalloc.h

diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4
index 076435f3aba800f6ac5080f057333e7b6470fe97..e13546ba0e137d93d29bd1697d37d676eb6bbfb7 100644 (file)
--- a/m4/nl_langinfo.m4
+++ b/m4/nl_langinfo.m4
@@ -8,13 +8,9 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO],
 [
   AC_REQUIRE([gl_LANGINFO_H_DEFAULTS])
   AC_REQUIRE([gl_LANGINFO_H])
-  if test $HAVE_LANGINFO_H = 1; then
-    AC_CHECK_FUNCS_ONCE([nl_langinfo])
-    : # in case AC_CHECK_FUNCS_ONCE expands to nothing
-  else
-    ac_cv_func_nl_langinfo=no
-  fi
-  if test $ac_cv_func_nl_langinfo = yes; then
+  AC_CHECK_FUNCS_ONCE([nl_langinfo])
+  if test $HAVE_LANGINFO_H = 1 \
+     && test x$ac_cv_func_nl_langinfo = xyes; then
     if test $HAVE_LANGINFO_CODESET = 1 && test $HAVE_LANGINFO_ERA = 1; then
       :
     else