diff options
| author | Peter Kokot <peterkokot@gmail.com> | 2018-08-06 09:39:33 +0200 |
|---|---|---|
| committer | Peter Kokot <peterkokot@gmail.com> | 2018-08-06 09:39:33 +0200 |
| commit | fab7d9f5776dc4359cb84c983dd7816edfe0ff65 (patch) | |
| tree | e8d30dc30bff6f29afcf049d18945be516807d0c | |
| parent | fa07b8bbb74f5a1c540d778a616c059b2a2277bc (diff) | |
| parent | a3e3d914edffc3128b67ba73ca7dc85c07aede43 (diff) | |
| download | php-git-fab7d9f5776dc4359cb84c983dd7816edfe0ff65.tar.gz | |
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
Fix bug #76709: Minimal required zlib library is 1.2.0.4
| -rw-r--r-- | ext/zlib/config0.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4 index 276c289660..c2533744e1 100644 --- a/ext/zlib/config0.m4 +++ b/ext/zlib/config0.m4 @@ -3,7 +3,7 @@ dnl $Id$ dnl PHP_ARG_WITH(zlib,for ZLIB support, -[ --with-zlib[=DIR] Include ZLIB support (requires zlib >= 1.0.9)]) +[ --with-zlib[=DIR] Include ZLIB support (requires zlib >= 1.2.0.4)]) PHP_ARG_WITH(zlib-dir,if the location of ZLIB install directory is defined, [ --with-zlib-dir=<DIR> Define the location of zlib install directory], no, no) @@ -33,7 +33,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then fi if test -z "$ZLIB_DIR"; then - AC_MSG_ERROR(Cannot find libz) + AC_MSG_ERROR(Cannot find zlib) fi case $ZLIB_DIR in @@ -45,7 +45,7 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then 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]) + AC_MSG_ERROR([zlib version greater or equal to 1.2.0.4 required]) fi PHP_CHECK_LIBRARY(z, gzgets, [ |