X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=d05ee194d731a4f414e9d4ef62e6810b09014687;hp=457821bc3481f5700fdeab3630e919007b1bd4ee;hb=52afbd9e2f860621ac40405d5c2298516493b121;hpb=16dba799dae126258bbb09e2f699d5d7954fac17

diff --git a/config.m4 b/config.m4
index 457821b..d05ee19 100644
--- a/config.m4
+++ b/config.m4
@@ -4,9 +4,6 @@ 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_ENABLE([http-stream-wrapper], [whether to enable experimental stream wrapper],
-[  --enable-http-stream-wrapper
-                           Enable experimental stream wrapper support], no, no)
 PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP requests],
 [  --with-http-curl-requests[=CURLDIR]
                            With cURL HTTP request support])
@@ -55,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 ----
@@ -200,8 +204,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])
 					])
 				])
 			])
@@ -228,7 +232,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_wrapper_api.h"
+		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])
@@ -239,7 +244,7 @@ dnl ----
 		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_wrapper_api.h"
+		php_http_deflatestream_object.h php_http_inflatestream_object.h"
 	ifdef([PHP_INSTALL_HEADERS], [
 		PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
 	], [
@@ -248,8 +253,4 @@ dnl ----
 	])
 
 	AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
-	
-	if test "$PHP_HTTP_STREAM_WRAPPER" = "yes"; then
-		AC_DEFINE([HTTP_HAVE_WRAPPER], [1], [Have experimental HTTP stream wrapper])
-	fi
 fi