php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-16 04:21:18 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.3'

Browse Source 
* PHP-7.3:
  Fix bug #76709: Minimal required zlib library is 1.2.0.4
This commit is contained in:
Peter Kokot
2018-08-06 09:40:06 +02:00
parent f2efcf868a fefaeae49c
commit 0d8b8ad0ce
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ext/zlib/config0.m4
View File

@@ -1,7 +1,7 @@
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)
@@ -31,7 +31,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
@@ -43,7 +43,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, [