Merge branch 'master' into feature/cmake

4 files changed, 14 insertions, 4 deletions

diff --git a/ChangeLog b/ChangeLog
index 32a7a12a..ce62f7ef 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2016-06-09         Arnold D. Robbins     <arnold@skeeve.com>
+
+	* dfa.c: Sync with GNU grep.
+
+	Unrelated:
+
+	* configure.ac: Move AM_CONDITIONAL[ENABLE_EXTENSIONS] outside
+	the enclosing if. Thanks to Assaf Gordon <assafgordon@gmail.com>
+	for the report.
+
 2016-06-08         Arnold D. Robbins     <arnold@skeeve.com>
 
 	* symbol.c (lookup): If got Node_val, it's a non-variable
diff --git a/configure b/configure
index 35d22850..c9955354 100755
--- a/configure
+++ b/configure
@@ -9971,7 +9971,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
@@ -9979,7 +9980,6 @@ else
   ENABLE_EXTENSIONS_FALSE=
 fi
 
-fi
 
 case $host_os in
 vms*|beos*|os2*|msdos)
diff --git a/configure.ac b/configure.ac
index a3e41e56..bfe785db 100644
--- a/configure.ac
+++ b/configure.ac
@@ -315,8 +315,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.
diff --git a/dfa.c b/dfa.c
index 2c5ce76c..ca8c3b15 100644
--- a/dfa.c
+++ b/dfa.c
@@ -1210,7 +1210,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;