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

diff --git a/config.m4 b/config.m4
index 2ff41aa..457821b 100644
--- a/config.m4
+++ b/config.m4
@@ -4,6 +4,9 @@ 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])
@@ -16,6 +19,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 -------
@@ -46,7 +64,7 @@ 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
@@ -77,6 +95,14 @@ dnl ----
 			AC_MSG_RESULT([found: $CURL_CONFIG])
 		fi
 		
+		dnl Debian stable has currently 7.13.2 (this is not a typo)
+		AC_MSG_CHECKING([for curl version >= 7.12.3])
+		CURL_VERSION=`$CURL_CONFIG --version | $SED -e 's/[[^0-9\.]]//g'`
+		AC_MSG_RESULT([$CURL_VERSION])
+		if test `echo $CURL_VERSION | $AWK '{print $1*10000 + $2*100 + $3}'` -lt 71203; then
+			AC_MSG_ERROR([libcurl version greater or equal to 7.12.3 required])
+		fi
+		
 		CURL_LIBS=`$CURL_CONFIG --libs`
 		
 		AC_MSG_CHECKING([for SSL support in libcurl])
@@ -167,23 +193,21 @@ dnl ----
 			fi
 			old_CPPFLAGS=$CPPFLAGS
 			CPPFLAGS=$INCLUDES
-			AC_CHECK_HEADER([php_hash.h], [
-				AC_MSG_RESULT(enabled)
-				AC_DEFINE([HTTP_HAVE_EXT_HASH], [1], [Have ext/hash support])
+			AC_MSG_RESULT([looking for php_hash.h])
+			AC_CHECK_HEADER([ext/hash/php_hash.h], [
+				AC_DEFINE([HTTP_HAVE_EXT_HASH_EXT_HASH], [1], [Have ext/hash support])
 			], [ 
 				AC_CHECK_HEADER([hash/php_hash.h], [
-					AC_MSG_RESULT(enabled)
 					AC_DEFINE([HTTP_HAVE_HASH_EXT_HASH], [1], [Have ext/hash support])
 				], [ 
-					AC_CHECK_HEADER([ext/hash/php_hash.h], [
-					 AC_MSG_RESULT(enabled)
-						AC_DEFINE([HTTP_HAVE_EXT_HASH_EXT_HASH], [1], [Have ext/hash support])
-					], [
-						AC_MSG_RESULT(disabled)
+  			AC_CHECK_HEADER([php_hash.h], [
+  				AC_DEFINE([HTTP_HAVE_EXT_HASH], [1], [Have ext/hash support])
 					])
 				])
 			])
 			CPPFLAGS=$old_CPPFLAGS;
+		else
+			AC_MSG_RESULT(disabled)
 		fi
 	elif test "$PHP_HASH" != "no" && test "x$PHP_HASH" != "x"; then
 		AC_MSG_RESULT(enabled)
@@ -204,7 +228,7 @@ 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_filter_api.c http_request_body_api.c http_wrapper_api.h"
 	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
 	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])
@@ -212,8 +236,10 @@ dnl ----
 	PHP_HTTP_HEADERS="php_http_std_defs.h php_http.h php_http_api.h php_http_cache_api.h \
 		php_http_date_api.h php_http_headers_api.h php_http_info_api.h php_http_message_api.h \
 		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_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"
 	ifdef([PHP_INSTALL_HEADERS], [
 		PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
 	], [
@@ -222,4 +248,8 @@ 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