--- embedaddon/php/ext/zlib/config0.m4	2012/02/21 23:48:05	1.1.1.1
+++ embedaddon/php/ext/zlib/config0.m4	2014/06/15 20:15:53	1.1.1.3.2.1.2.1
@@ -1,5 +1,5 @@
 dnl
-dnl $Id: config0.m4,v 1.1.1.1 2012/02/21 23:48:05 misho Exp $
+dnl $Id: config0.m4,v 1.1.1.3.2.1.2.1 2014/06/15 20:15:53 misho Exp $
 dnl
 
 PHP_ARG_WITH(zlib,for ZLIB support,
@@ -8,7 +8,7 @@ PHP_ARG_WITH(zlib,for ZLIB support,
 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)
 
-if test "$PHP_ZLIB" != "no"; then
+if test "$PHP_ZLIB" != "no" || test "$PHP_ZLIB_DIR" != "no"; then
   PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared)
   PHP_SUBST(ZLIB_SHARED_LIBADD)
   
@@ -41,10 +41,17 @@ if test "$PHP_ZLIB" != "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 zlib >= 1.0.9)
+    AC_MSG_ERROR(ZLIB extension requires gzgets in zlib)
   ],[
     $ac_extra
   ])