diff options
| author | Jani Taskinen <jani@php.net> | 2010-03-12 10:28:59 +0000 |
|---|---|---|
| committer | Jani Taskinen <jani@php.net> | 2010-03-12 10:28:59 +0000 |
| commit | af49e58f5155383a440041c77cc1ecbaf507fde7 (patch) | |
| tree | 01ffe64d6f78450fb828f73d0e1e59f3cc7c8c76 /ext/zlib/config0.m4 | |
| parent | ea539c8b88c9278363b6de0b39446e4e8e043391 (diff) | |
| download | php-git-af49e58f5155383a440041c77cc1ecbaf507fde7.tar.gz | |
- Reverted r296062 and r296065
Diffstat (limited to 'ext/zlib/config0.m4')
| -rw-r--r-- | ext/zlib/config0.m4 | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/ext/zlib/config0.m4 b/ext/zlib/config0.m4 index 25c7f4f420..62e05fbd02 100644 --- a/ext/zlib/config0.m4 +++ b/ext/zlib/config0.m4 @@ -41,17 +41,10 @@ if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then *) ac_extra=-L$ZLIB_DIR/$PHP_LIBDIR ;; 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'` - 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]) - fi - PHP_CHECK_LIBRARY(z, gzgets, [ AC_DEFINE(HAVE_ZLIB,1,[ ]) ],[ - AC_MSG_ERROR(ZLIB extension requires gzgets in zlib) + AC_MSG_ERROR(ZLIB extension requires zlib >= 1.0.9) ],[ $ac_extra ]) |