X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=config.m4;h=f3c56265fa6582a077c62fb11d4af9ac9254af39;hb=ad75baff52e98f85a3ac999cee3328819fee03b8;hp=a99a32dba7d2396b368ce805c72a680676c1a218;hpb=22ef1d84f0722d4a2d67c827eb3fb24d50134fb4;p=m6w6%2Fext-http

diff --git a/config.m4 b/config.m4
index a99a32d..f3c5626 100644
--- a/config.m4
+++ b/config.m4
@@ -46,7 +46,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 +77,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`
 		
 		CURL_ZLIB=`$CURL_CONFIG --features | $EGREP libz`
@@ -207,7 +215,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"
 	PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, $ext_shared)
 	PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
 	PHP_SUBST([HTTP_SHARED_LIBADD])
@@ -215,8 +223,9 @@ 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"
 	ifdef([PHP_INSTALL_HEADERS], [
 		PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
 	], [