diff options
| author | Joe Watkins <krakjoe@php.net> | 2017-06-22 14:01:54 +0100 |
|---|---|---|
| committer | Joe Watkins <krakjoe@php.net> | 2017-06-22 14:02:09 +0100 |
| commit | 0f15a0302679fc100c06ad5f81af9117d6fa2a22 (patch) | |
| tree | cb143da1a03e6bb0efadf27d1e58eb5e0bd9df3b | |
| parent | 9437dcd621b326d23babe7fe93ebb984aac79e6a (diff) | |
| parent | 21cbdf6984612eaa8764d3dfae8062f202aee52c (diff) | |
| download | php-git-0f15a0302679fc100c06ad5f81af9117d6fa2a22.tar.gz | |
Merge branch 'PHP-7.1'
* PHP-7.1:
Fix configure error
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | acinclude.m4 | 2 |
2 files changed, 2 insertions, 1 deletions
@@ -5,6 +5,7 @@ PHP NEWS - Core: . Fixed bug #74780 (parse_url() borken when query string contains colon). (jhdxr) + . Fixed bug #74761 (Unary operator expected error on some systems). (petk) - SPL: . Fixed bug #73471 (PHP freezes with AppendIterator). (jhdxr) diff --git a/acinclude.m4 b/acinclude.m4 index 07ae363f65..ff814fb059 100644 --- a/acinclude.m4 +++ b/acinclude.m4 @@ -2676,7 +2676,7 @@ EOF done echo "'[$]0' \\" >> $1 - if test `expr -- [$]0 : "'.*"` = 0; then + if test `expr " [$]0" : " '.*"` = 0; then CONFIGURE_COMMAND="$CONFIGURE_COMMAND '[$]0'" else CONFIGURE_COMMAND="$CONFIGURE_COMMAND [$]0" |