com php-src: Fix bug #76709: Minimal required zlib library is 1.2.0.4: ext/zlib/config0.m4

Commit: a3e3d914edffc3128b67ba73ca7dc85c07aede43 Author: Peter Kokot <peterkokot@gmail.com> Mon, 6 Aug 2018 09:37:16 +0200 Parents: 4d5edcb4ac8975c864c695e9d4e02e5e79c0f727 Branches: PHP-7.1 PHP-7.2 PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=a3e3d914edffc3128b67ba73ca7dc85c07aede43 Log: Fix bug #76709: Minimal required zlib library is 1.2.0.4 The minimal required version of zlib system library is 1.2.0.4 instead of 1.0.9 as reported in the ../configure --help. Bugs: https://bugs.php.net/76709 Changed paths: M ext/zlib/config0.m4 Diff: diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4 index 276c289..c253374 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, [