add --with-zlib for library, --enable-zlib for extension

Author: glensc

ext/standard/config.m4

@@ -265,6 +265,20 @@ else
   AC_DEFINE_UNQUOTED(PHP_USE_PHP_CRYPT_R, 0, [Whether PHP has to use its own crypt_r for blowfish, des and ext des])
 fi
 
+dnl
+dnl Check for -lz
+dnl
+PHP_ARG_WITH([zlib],
+  [for ZLIB support],
+  [AS_HELP_STRING([--with-zlib],
+    [Include ZLIB support (requires zlib >= 1.2.0.4)])])
+
+if test "$PHP_ZLIB" != "no"; then
+  PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0.4])
+  LIBS="-lz $LIBS"
+  AC_DEFINE(HAVE_ZLIB,1,[ ])
+fi
+
 dnl
 dnl Check for __attribute__ ((__aligned__)) support in the compiler
 dnl

ext/zlib/config0.m4

@@ -1,16 +1,13 @@
-PHP_ARG_WITH([zlib],
-  [for ZLIB support],
-  [AS_HELP_STRING([--with-zlib],
-    [Include ZLIB support (requires zlib >= 1.2.0.4)])])
+PHP_ARG_ENABLE([zlib],
+  [whether to enable zlib extension],
+  [AS_HELP_STRING([--enable-zlib],
+    [Enable zlib extension])],
+  [no])
 
 if test "$PHP_ZLIB" != "no"; then
-  PKG_CHECK_MODULES([ZLIB], [zlib >= 1.2.0.4])
-
   PHP_EVAL_LIBLINE($ZLIB_LIBS, ZLIB_SHARED_LIBADD)
   PHP_EVAL_INCLINE($ZLIB_CFLAGS)
 
-  AC_DEFINE(HAVE_ZLIB,1,[ ])
-
   PHP_NEW_EXTENSION(zlib, zlib.c zlib_fopen_wrapper.c zlib_filter.c, $ext_shared,, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1)
   PHP_SUBST(ZLIB_SHARED_LIBADD)
 fi