X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=bf19c2418424870dc919c62d4d8e3748c14fa40b;hp=169aa1561d2b983a9974f13366aa8da28c91503c;hb=a759e1fae5a4d0e989b9735adf8f3224ed9419d7;hpb=9ae4e3a3f75d88489101f237848658b6b54f006a

diff --git a/config.m4 b/config.m4
index 169aa15..bf19c24 100644
--- 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 -------
@@ -87,11 +102,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
@@ -215,7 +225,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])
@@ -223,8 +233,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)
 	], [