com php-src: Fix bug #65988: Zlib version check fails: ext/zlib/config0.m4
| From: | Peter Kokot | Date: | Mon, 06 Aug 2018 04:14:11 +0000 |
| Subject: | com php-src: Fix bug #65988: Zlib version check fails: ext/zlib/config0.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-102837@lists.php.net to get a copy of this message | ||
Commit: c8a90606c186cc746b717777b4adb20a515e6afd
Author: Jay Bonci <jay@bonci.net> Mon, 6 Aug 2018 06:14:11 +0200
Committer: Peter Kokot <peterkokot@gmail.com> Mon, 6 Aug 2018 06:14:11 +0200
Parents: b4b14d21067b35cf506918411a8006de12a32cbe
Branches: PHP-7.1 PHP-7.2 PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=c8a90606c186cc746b717777b4adb20a515e6afd
Log:
Fix bug #65988: Zlib version check fails
When an 'include/zlib/' style dir is passed to --with-zlib configure
option the zlib version check fails.
Bugs:
https://bugs.php.net/65988
Changed paths:
M ext/zlib/config0.m4
Diff:
diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4
index ab94c15..276c289 100644
--- a/ext/zlib/config0.m4
+++ b/ext/zlib/config0.m4
@@ -42,7 +42,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR"
!= "no"; then
esac
AC_MSG_CHECKING([for zlib version >= 1.2.0.4])
- ZLIB_VERSION=
$EGREP "define ZLIB_VERSION" $ZLIB_DIR/include/zlib.h | $SED -e
's/[[^0-9\.]]//g'
+ ZLIB_VERSION=$EGREP "define ZLIB_VERSION" $ZLIB_INCDIR/zlib.h | $SED -e
's/[[^0-9\.]]//g'
AC_MSG_RESULT([$ZLIB_VERSION])
if test echo $ZLIB_VERSION | $SED -e 's/[[^0-9]]/ /g' | $AWK '{print
$1*1000000 + $2*10000 + $3*100 + $4}' -lt 1020004; then
AC_MSG_ERROR([libz version greater or equal to 1.2.0.4 required])