- gcc didn't like those changes

[m6w6/ext-http] / config.m4

diff --git a/config.m4 b/config.m4
index f3c56265fa6582a077c62fb11d4af9ac9254af39..7ff9a6b5f71252061084ad16dfc4bcc59e007bdf 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -16,6 +16,21 @@ PHP_ARG_WITH([http-zlib-compression], [whether to enable support for gzencoded/d
 
 if test "$PHP_HTTP" != "no"; then
 
+       ifdef([AC_PROG_EGREP], [
+               AC_PROG_EGREP
+       ], [
+               AC_CHECK_PROG(EGREP, egrep, egrep)
+       ])
+       ifdef([AC_PROG_SED], [
+               AC_PROG_SED
+       ], [
+               ifdef([LT_AC_PROG_SED], [
+                       LT_AC_PROG_SED
+               ], [
+                       AC_CHECK_PROG(SED, sed, sed)
+               ])
+       ])
+
 dnl -------
 dnl NETDB.H
 dnl -------
@@ -37,9 +52,16 @@ dnl ----
                AC_MSG_WARN([gzip support not enabled; zlib.h not found])
        else
                AC_MSG_RESULT([found in $ZLIB_DIR])
-               PHP_ADD_INCLUDE($ZLIB_DIR/include)
-               PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-               AC_DEFINE([HTTP_HAVE_ZLIB], [1], [Have zlib support])
+               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_WARN([gzip support not enabled; libz version greater or equal to 1.2.0.4 required])
+               else
+                       PHP_ADD_INCLUDE($ZLIB_DIR/include)
+                       PHP_ADD_LIBRARY_WITH_PATH(z, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+                       AC_DEFINE([HTTP_HAVE_ZLIB], [1], [Have zlib support])
+               fi
        fi
        
 dnl ----
@@ -87,11 +109,6 @@ dnl ----
                
                CURL_LIBS=`$CURL_CONFIG --libs`
                
-               CURL_ZLIB=`$CURL_CONFIG --features | $EGREP libz`
-               if test "$CURL_ZLIB" = "libz"; then
-                       AC_DEFINE([HTTP_HAVE_CURL_ZLIB], [1], [ ])
-               fi
-               
                AC_MSG_CHECKING([for SSL support in libcurl])
                CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
                if test "$CURL_SSL" = "SSL"; then