>From a22711636c61ed549191b7993662a1fb4a544b53 Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 5 Jan 2010 18:54:29 +0100 Subject: [PATCH] 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. --- ChangeLog | 6 ++++++ m4/nl_langinfo.m4 | 10 +++------- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 2857d3d..fd6fa65 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2010-01-05 Paolo Bonzini + + 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-05 Jim Meyering maint: remove useless inclusions of "xalloc.h" diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4 index 076435f..e13546b 100644 --- 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 -- 1.6.5.2