nl_langinfo: avoid configure-time syntax error

* m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): When we've already tested
for nl_langinfo.h, AC_CHECK_FUNCS_ONCE([nl_langinfo]) expands to
the empty string.  Don't let that provoke a shell syntax error.

diff --git a/ChangeLog b/ChangeLog
index 74569041b1d8c6cfbfafc755a81b101ada94f597..237fa5c489d9c15d6f1eb8838ec2f73dd57fd49d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2010-01-04  Jim Meyering  <meyering@redhat.com>
 
+       nl_langinfo: avoid configure-time syntax error
+       * m4/nl_langinfo.m4 (gl_FUNC_NL_LANGINFO): When we've already tested
+       for nl_langinfo.h, AC_CHECK_FUNCS_ONCE([nl_langinfo]) expands to
+       the empty string.  Don't let that provoke a shell syntax error.
+
        regcomp, regexec, fnmatch: avoid array bounds read error
        * lib/regcomp.c (build_equiv_class): From glibc:
        Use only the low 24 bits of a findidx return value as an index

diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4
index ecb05c4a382146684f4ab5b924948d4d460d5e01..076435f3aba800f6ac5080f057333e7b6470fe97 100644 (file)
--- a/m4/nl_langinfo.m4
+++ b/m4/nl_langinfo.m4
@@ -1,4 +1,4 @@
-# nl_langinfo.m4 serial 1
+# nl_langinfo.m4 serial 2
 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,
@@ -10,6 +10,7 @@ AC_DEFUN([gl_FUNC_NL_LANGINFO],
   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