- highly experimental stream wrapper

[m6w6/ext-http] / config.m4

diff --git a/config.m4 b/config.m4
index 6b79648958715b54271ddb79bdf7bd77ac5e8753..457821bc3481f5700fdeab3630e919007b1bd4ee 100644 (file)
--- 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 -------
@@ -87,11 +105,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 +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_request_body_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])
@@ -223,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_request_body_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_wrapper_api.h"
        ifdef([PHP_INSTALL_HEADERS], [
                PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADERS)
        ], [
@@ -233,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