- allow to disable zlib support

[m6w6/ext-http] / config.m4

diff --git a/config.m4 b/config.m4
index bf19c2418424870dc919c62d4d8e3748c14fa40b..0afce19355300457f472b613a18e99c9d47de18f 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -4,15 +4,15 @@ dnl vim: noet ts=1 sw=1
 
 PHP_ARG_ENABLE([http], [whether to enable extended HTTP support],
 [  --enable-http           Enable extended HTTP support])
-PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP requests],
-[  --with-http-curl-requests[=CURLDIR]
-                           With cURL HTTP request support])
+PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP request support],
+[  --with-http-curl-requests[=LIBCURLDIR]
+                           HTTP: with cURL request support], "yes")
+PHP_ARG_WITH([http-zlib-compression], [whether to enable zlib encodings support],
+[  --with-http-zlib-compression[=LIBZDIR]
+                           HTTP: with zlib encodings support])
 PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
-[  --with-http-magic-mime[=MAGICDIR]
-                           With magic mime response content type guessing])
-PHP_ARG_WITH([http-zlib-compression], [whether to enable support for gzencoded/deflated message bodies],
-[  --with-http-zlib-compression[=ZLIBDIR]
-                           With zlib gzdecode and inflate support])
+[  --with-http-magic-mime[=LIBMAGICDIR]
+                           HTTP: with magic mime response content type guessing])
 
 if test "$PHP_HTTP" != "no"; then
 
@@ -39,29 +39,37 @@ dnl -------
 dnl ----
 dnl ZLIB
 dnl ----
-       AC_MSG_CHECKING([for zlib.h])
-       ZLIB_DIR=
-       for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /user/local /usr /opt; do
-               if test -f "$i/include/zlib.h"; then
-                       ZLIB_DIR=$i
-                       break;
+       if test "$PHP_HTTP_ZLIB_ENCODINGS" != "no"; then
+               AC_MSG_CHECKING([for zlib.h])
+               ZLIB_DIR=
+               for i in "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /user/local /usr /opt; do
+                       if test -f "$i/include/zlib.h"; then
+                               ZLIB_DIR=$i
+                               break;
+                       fi
+               done
+               if test -z "$ZLIB_DIR"; then
+                       AC_MSG_RESULT([not found])
+                       AC_MSG_WARN([could not find zlib.h])
+               else
+                       AC_MSG_RESULT([found in $ZLIB_DIR])
+                       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])
+                       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
-       done
-       if test -z "$ZLIB_DIR"; then
-               AC_MSG_RESULT([not found])
-               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])
        fi
        
 dnl ----
 dnl CURL
 dnl ----
        if test "$PHP_HTTP_CURL_REQUESTS" != "no"; then
-
                AC_MSG_CHECKING([for curl/curl.h])
                CURL_DIR=
                for i in "$PHP_HTTP_CURL_REQUESTS" /usr/local /usr /opt; do
@@ -157,7 +165,6 @@ dnl ----
 dnl MAGIC
 dnl ----
        if test "$PHP_HTTP_MAGIC_MIME" != "no"; then
-       
                AC_MSG_CHECKING([for magic.h])
                MAGIC_DIR=
                for i in "$PHP_HTTP_MAGIC_MIME" /usr/local /usr /opt; do
@@ -181,7 +188,6 @@ dnl ----
 dnl ----
 dnl HASH
 dnl ----
-
        AC_MSG_CHECKING(for ext/hash support)
        if test -x "$PHP_EXECUTABLE"; then
                if test "`$PHP_EXECUTABLE -m | $EGREP '^hash$'`" = "hash"; then
@@ -197,8 +203,8 @@ dnl ----
                                AC_CHECK_HEADER([hash/php_hash.h], [
                                        AC_DEFINE([HTTP_HAVE_HASH_EXT_HASH], [1], [Have ext/hash support])
                                ], [ 
-                       AC_CHECK_HEADER([php_hash.h], [
-                               AC_DEFINE([HTTP_HAVE_EXT_HASH], [1], [Have ext/hash support])
+                                       AC_CHECK_HEADER([php_hash.h], [
+                                               AC_DEFINE([HTTP_HAVE_EXT_HASH], [1], [Have ext/hash support])
                                        ])
                                ])
                        ])
@@ -225,7 +231,8 @@ dnl ----
                http_api.c http_cache_api.c http_request_api.c http_date_api.c \
                http_headers_api.c http_message_api.c http_send_api.c http_url_api.c \
                http_info_api.c http_request_method_api.c http_encoding_api.c \
-               http_filter_api.c http_request_body_api.c"
+               http_filter_api.c http_request_body_api.c \
+               http_deflatestream_object.c http_inflatestream_object.c"
        PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
        PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
        PHP_SUBST([HTTP_SHARED_LIBADD])
@@ -235,7 +242,8 @@ dnl ----
                php_http_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.h \
                php_http_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.h \
                php_http_exception_object.h php_http_message_object.h php_http_request_object.h \
-               php_http_requestpool_object.h php_http_response_object.h php_http_util_object.h"
+               php_http_requestpool_object.h php_http_response_object.h php_http_util_object.h \
+               php_http_deflatestream_object.h php_http_inflatestream_object.h"
        ifdef([PHP_INSTALL_HEADERS], [
                PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
        ], [