From: Nikita Popov <nikita.ppv@gmail.com>
Date: Mon, 13 Jul 2020 07:40:19 +0000 (+0200)
Subject: Fixed bug #79841
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=86e2b7bb70131b48636cded57e5bc62b81b79865;p=php

Fixed bug #79841
---

diff --git a/NEWS b/NEWS
index a93706e135..1d7e8885d9 100644
--- a/NEWS
+++ b/NEWS
@@ -7,6 +7,8 @@ PHP                                                                        NEWS
     not handled properly). (Nikita)
   . Fixed bug #79791 (Assertion failure when unsetting variable during binary
     op). (Nikita)
+  . Fixed bug #79841 (Syntax error in configure / unescaped "[]" in php.m4).
+    (Nikita)
 
 09 Jul 2020, PHP 8.0.0alpha2
 
diff --git a/build/php.m4 b/build/php.m4
index d181bbeeba..9fb6811a6a 100644
--- a/build/php.m4
+++ b/build/php.m4
@@ -1784,7 +1784,9 @@ AC_DEFUN([PHP_PROG_BISON], [
     AC_MSG_CHECKING([for bison version])
 
     php_bison_version=$($YACC --version 2> /dev/null | grep 'GNU Bison' | cut -d ' ' -f 4 | tr -d a-z)
-    [ -z "$php_bison_version" ] && php_bison_version=0.0.0
+    if test -z "$php_bison_version"; then
+      php_bison_version=0.0.0
+    fi
     ac_IFS=$IFS; IFS="."
     set $php_bison_version
     IFS=$ac_IFS
@@ -1849,7 +1851,9 @@ AC_DEFUN([PHP_PROG_RE2C],[
     AC_MSG_CHECKING([for re2c version])
 
     php_re2c_version=$($RE2C --version | cut -d ' ' -f 2 2>/dev/null)
-    [ -z "$php_re2c_version" ] && php_re2c_version=0.0.0
+    if test -z "$php_re2c_version"; then
+      php_re2c_version=0.0.0
+    fi
     ac_IFS=$IFS; IFS="."
     set $php_re2c_version
     IFS=$ac_IFS