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.
(cherry picked from commit 7a29e0093f4a87478cdf7b7c87786272d6f37dfe)

Conflicts:

	ChangeLog

diff --git a/ChangeLog b/ChangeLog
index 272c77f..237fa5c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,39 @@
+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
+       into the weights array.  Patch by Ulrich Drepper:
+       http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commit;h=b7d1c5fa30
+       * lib/regexec.c (check_node_accept_bytes): Likewise.
+       * lib/fnmatch_loop.c (FCT): Likewise.
+
+       regcomp: skip collseq lookup when there are no rules
+       * lib/regcomp.c (lookup_collation_sequence_value): From glibc:
+       http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a532a41df58
+
+       regcomp: recognize ill-formed { } expressions
+       * lib/regcomp.c (parse_dup_op): From glibc:
+       http://sourceware.org/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=a87cd2894cb
+
+       regcomp: fix typo in comment
+       * lib/regcomp.c (duplicate_node_closure): Sync from glibc.
+       s/satisfy/satisfies/.
+
+       regcomp: sync from glibc: remove dead store
+       * lib/regcomp.c (duplicate_node_closure): Remove useless
+       search_duplicated_node call and dead store.
+
+       regcomp: sync from glibc; always use nl_langinfo
+       * lib/regcomp.c (init_dfa) [!LIBC]: Always use nl_langinfo (CODESET),
+       now that gnulib provides it.  Recognize UTF8 as well as UTF-8.
+       * modules/regex (Depends-on): Add nl_langinfo.
+
 2010-01-04  Eric Blake  <ebb9@byu.net>
 
        fdopendir: fix configure test

diff --git a/NEWS.stable b/NEWS.stable
index b7feff5..62bd5db 100644 (file)
--- a/NEWS.stable
+++ b/NEWS.stable
@@ -13,6 +13,7 @@ with the following additional commits:
     * [1bf02c3]->[2e79dd2] wchar: Remove unused configure check.
     * [8f3aa1f]->[ab43907] autoupdate
     * [e138cd8]->[18a2e77] fdopendir: fix configure test
+    * [7a29e00]->[] nl_langinfo: avoid configure-time syntax error
 __NEXTCOMMITMARKER__
 
 ----------------------------------------------------------------------

diff --git a/m4/nl_langinfo.m4 b/m4/nl_langinfo.m4
index ecb05c4..076435f 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