From ac268ec2058b1615f41c750ccc55cf038ab1bca6 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Thu, 9 Jun 2016 21:48:36 +0300 Subject: Sync with grep. --- ChangeLog | 4 ++++ dfa.c | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 922f4f06..f3ca45bc 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,7 @@ +2016-06-09 Arnold D. Robbins + + * dfa.c: Sync with GNU grep. + 2016-06-08 Arnold D. Robbins * symbol.c (lookup): If got Node_val, it's a non-variable diff --git a/dfa.c b/dfa.c index a41914e0..97d4497b 100644 --- a/dfa.c +++ b/dfa.c @@ -1222,7 +1222,7 @@ parse_bracket_exp (void) if (dfa->multibyte) { - static charclass zeroclass; + static charclass const zeroclass; work_mbc->invert = invert; work_mbc->cset = equal (ccl, zeroclass) ? -1 : charclass_index (ccl); return MBCSET; -- cgit v1.2.3 From 2f17c9377828998b8b0f6cabc17b63353efab385 Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Thu, 9 Jun 2016 21:49:10 +0300 Subject: Fix configure.ac --disable-extensions. --- ChangeLog | 6 ++++++ configure.ac | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f3ca45bc..e49c5c8a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -2,6 +2,12 @@ * dfa.c: Sync with GNU grep. + Unrelated: + + * configure.ac: Move AM_CONDITIONAL[ENABLE_EXTENSIONS] outside + the enclosing if. Thanks to Assaf Gordon + for the report. + 2016-06-08 Arnold D. Robbins * symbol.c (lookup): If got Node_val, it's a non-variable diff --git a/configure.ac b/configure.ac index 62f79ece..58600f23 100644 --- a/configure.ac +++ b/configure.ac @@ -334,8 +334,8 @@ if test "x$enable_extensions" != "xno"; then AC_MSG_ERROR([extension support requested, but unavailable]) fi enable_extensions=$extensions_supported - AM_CONDITIONAL([ENABLE_EXTENSIONS], [test "x$enable_extensions" = "xyes"]) fi +AM_CONDITIONAL([ENABLE_EXTENSIONS], [test "x$enable_extensions" = "xyes"]) dnl check for how to use getpgrp dnl have to hardwire it for VMS POSIX. Sigh. -- cgit v1.2.3 From f54bc428df973ee3af4731057e9c50f69d02745c Mon Sep 17 00:00:00 2001 From: "Arnold D. Robbins" Date: Thu, 9 Jun 2016 21:58:41 +0300 Subject: And add configure too. Oops. --- configure | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure b/configure index 634c667f..c7f5ddce 100755 --- a/configure +++ b/configure @@ -10597,7 +10597,8 @@ fi as_fn_error $? "extension support requested, but unavailable" "$LINENO" 5 fi enable_extensions=$extensions_supported - if test "x$enable_extensions" = "xyes"; then +fi + if test "x$enable_extensions" = "xyes"; then ENABLE_EXTENSIONS_TRUE= ENABLE_EXTENSIONS_FALSE='#' else @@ -10605,7 +10606,6 @@ else ENABLE_EXTENSIONS_FALSE= fi -fi case $host_os in vms*|beos*|os2*|msdos) -- cgit v1.2.3