com php-src: Merge branch 'PHP-7.2' into PHP-7.3: ext/zlib/config0.m4

Commit: fefaeae49c743e85309c82b92a2c154a0d5b2c60 Author: Peter Kokot <peterkokot@gmail.com> Mon, 6 Aug 2018 09:39:52 +0200 Parents: 2c7267398692f15d48f3f53f362f944e6b8f3ee3 fab7d9f5776dc4359cb84c983dd7816edfe0ff65 Branches: PHP-7.3 master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=fefaeae49c743e85309c82b92a2c154a0d5b2c60 Log: Merge branch 'PHP-7.2' into PHP-7.3 * PHP-7.2: Fix bug #76709: Minimal required zlib library is 1.2.0.4 Bugs: https://bugs.php.net/76709 Changed paths: MM ext/zlib/config0.m4 Diff: diff --cc ext/zlib/config0.m4 index 0a7dae3,c253374..71fe7a7 --- a/ext/zlib/config0.m4 +++ b/ext/zlib/config0.m4 @@@ -1,7 -1,9 +1,7 @@@ -dnl -dnl $Id$ -dnl +dnl config.m4 for extension zlib 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) @@@ -29,9 -31,9 +29,9 @@@ if test "$PHP_ZLIB" != "no" || test "$P fi done fi - + if test -z "$ZLIB_DIR"; then - AC_MSG_ERROR(Cannot find libz) + AC_MSG_ERROR(Cannot find zlib) fi case $ZLIB_DIR in