- move the chunked decoder to the encoding_api

[m6w6/ext-http] / config.m4

diff --git a/config.m4 b/config.m4
index 5201be6bb5a47e5a57dd6411c86225ba6372d799..aac5a5462670a07da1ccbae5454dd807aad9c8b3 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -3,7 +3,7 @@ dnl $Id$
 
 PHP_ARG_ENABLE([http], [whether to enable extended HTTP support],
 [  --enable-http           Enable extended HTTP support])
-PHP_ARG_WITH([http-curl-requests], [wheter to enable cURL HTTP requests],
+PHP_ARG_WITH([http-curl-requests], [whether to enable cURL HTTP requests],
 [  --with-http-curl-requests[=CURLDIR]
                            With cURL HTTP request support])
 PHP_ARG_WITH([http-mhash-etags], [whether to enable mhash ETag generator],
@@ -12,6 +12,9 @@ PHP_ARG_WITH([http-mhash-etags], [whether to enable mhash ETag generator],
 PHP_ARG_WITH([http-magic-mime], [whether to enable response content type guessing],
 [  --with-http-magic-mime[=MAGICDIR]
                            With magic mime response content type guessing])
+PHP_ARG_WITH([http-zlib-compression], [whether to enable support for gzencoded/deflated message bodies])
+[  --with-http-zlib-compression[=ZLIBDIR]
+                           With zlib gzdecode and inflate support])
 
 if test "$PHP_HTTP" != "no"; then
 
@@ -26,6 +29,27 @@ dnl -------
                AC_MSG_RESULT(not found in default path)
        fi
 
+dnl ----
+dnl ZLIB
+dnl ----
+       AC_MSG_CHECKING([for zlib.h])
+       ZLIB_DIR=
+       for i int "$PHP_HTTP_ZLIB_COMPRESSION" "$PHP_ZLIB_DIR" "$PHP_ZLIB" /user/local /usr /opt; do
+               if test -r "$i/include/zlib.h"; then
+                       ZLIB_DIR=$i
+                       break;
+               fi
+       done
+       if test -z "$ZLIB_DIR"; then
+               AC_MSG_RESULT([not found])
+               AC_MSG_WARNING([zlib 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(libz, $ZLIB_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
+               AC_DEFINE([HTTP_HAVE_ZLIB], [1], [Have zlib support])
+       fi
+       
 dnl ----
 dnl CURL
 dnl ----
@@ -61,6 +85,12 @@ dnl ----
                        AC_MSG_RESULT([found: $CURL_CONFIG])
                fi
                
+               CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
+               if test "$CURL_SSL" == "SSL"; then
+                       AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
+               fi
+               AC_CHECK_HEADERS([openssl/crypto.h])
+               
                CURL_LIBS=`$CURL_CONFIG --libs`
                
                PHP_ADD_INCLUDE($CURL_DIR/include)
@@ -76,6 +106,10 @@ dnl ----
                        [AC_DEFINE([HAVE_CURL_EASY_STRERROR], [1], [ ])], [ ],
                        [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
                )
+               PHP_CHECK_LIBRARY(curl, curl_easy_reset,
+                       [AC_DEFINE([HAVE_CURL_EASY_RESET], [1], [ ])], [ ],
+                       [$CURL_LIBS -L$CURL_DIR/$PHP_LIBDIR]
+               )
        fi
 
 dnl ----
@@ -136,14 +170,15 @@ dnl ----
                http_response_object.c http_exception_object.c http_requestpool_object.c \
                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_info_api.c http_request_method_api.c http_encoding_api.c"
        PHP_NEW_EXTENSION([http], $PHP_HTTP_SOURCES, [$ext_shared])
        PHP_ADD_BUILD_DIR($ext_builddir/phpstr, 1)
        PHP_SUBST([HTTP_SHARED_LIBADD])
 
        HTTP_HEADER_FILES="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_request_api.h php_http_request_method_api.h php_http_send_api.h php_http_url_api.h \
+               php_http_encodig_api.h"
        PHP_SUBST([HTTP_HEADER_FILES])
 
        ifdef([PHP_INSTALL_HEADERS],