- using Accept-Encoding header instead of CURLOPT_ENCODING avoids issues with curl...

[m6w6/ext-http] / config.m4

diff --git a/config.m4 b/config.m4
index 26832b9986f29798377242ab6f1510e4eb9691f1..bf19c2418424870dc919c62d4d8e3748c14fa40b 100644 (file)
--- 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 -------
@@ -46,7 +61,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,13 +92,16 @@ dnl ----
                        AC_MSG_RESULT([found: $CURL_CONFIG])
                fi
                
-               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], [ ])
+               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])
                CURL_SSL=`$CURL_CONFIG --features | $EGREP SSL`
                if test "$CURL_SSL" = "SSL"; then
@@ -172,23 +190,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)
@@ -209,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])
@@ -217,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)
        ], [