diff options
| author | Jay Bonci <jay@bonci.net> | 2018-08-06 06:14:11 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-08-06 06:14:11 +0200 |
| commit | c8a90606c186cc746b717777b4adb20a515e6afd (patch) | |
| tree | 79821a5e48ba6f44787c876d1eabd43cb0f1f6c5 | |
| parent | b4b14d21067b35cf506918411a8006de12a32cbe (diff) | |
| download | php-git-c8a90606c186cc746b717777b4adb20a515e6afd.tar.gz | |
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.
| -rw-r--r-- | ext/zlib/config0.m4 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4 index ab94c15fe0..276c289660 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]) |