- using Accept-Encoding header instead of CURLOPT_ENCODING avoids issues with curl...
[m6w6/ext-http] / config.m4
index 1952cd94922378927d766d5290689803e98a69bd..bf19c2418424870dc919c62d4d8e3748c14fa40b 100644 (file)
--- a/config.m4
+++ b/config.m4
@@ -7,9 +7,6 @@ PHP_ARG_ENABLE([http], [whether to enable extended HTTP support],
 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],
-[  --with-http-mhash-etags[=MHASHDIR]
-                           With mhash ETag generator support])
 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])
@@ -19,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 -------
@@ -49,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
@@ -80,6 +92,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`
                
                AC_MSG_CHECKING([for SSL support in libcurl])
@@ -133,31 +153,6 @@ dnl ----
                )
        fi
 
-dnl ----
-dnl MHASH
-dnl ----
-       if test "$PHP_HTTP_MHASH_ETAGS" != "no"; then
-       
-               AC_MSG_CHECKING([for mhash.h])
-               MHASH_DIR=
-               for i in "$PHP_HTTP_MHASH_ETAGS" /usr/local /usr /opt; do
-                       if test -f "$i/include/mhash.h"; then
-                               MHASH_DIR=$i
-                               break
-                       fi
-               done
-               if test -z "$MHASH_DIR"; then
-                       AC_MSG_RESULT([not found])
-                       AC_MSG_ERROR([could not find mhash.h])
-               else
-                       AC_MSG_RESULT([found in $MHASH_DIR])
-               fi
-       
-               PHP_ADD_INCLUDE($MHASH_DIR/include)
-               PHP_ADD_LIBRARY_WITH_PATH(mhash, $MHASH_DIR/$PHP_LIBDIR, HTTP_SHARED_LIBADD)
-               AC_DEFINE([HTTP_HAVE_MHASH], [1], [Have mhash support])
-       fi
-
 dnl ----
 dnl MAGIC
 dnl ----
@@ -183,6 +178,44 @@ dnl ----
                AC_DEFINE([HTTP_HAVE_MAGIC], [1], [Have magic mime support])
        fi
 
+dnl ----
+dnl HASH
+dnl ----
+
+       AC_MSG_CHECKING(for ext/hash support)
+       if test -x "$PHP_EXECUTABLE"; then
+               if test "`$PHP_EXECUTABLE -m | $EGREP '^hash$'`" = "hash"; then
+                       if test -d ../hash; then
+                               PHP_ADD_INCLUDE([../hash])
+                       fi
+                       old_CPPFLAGS=$CPPFLAGS
+                       CPPFLAGS=$INCLUDES
+                       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_DEFINE([HTTP_HAVE_HASH_EXT_HASH], [1], [Have ext/hash support])
+                               ], [ 
+                       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)
+               ifdef([PHP_ADD_EXTENSION_DEP], [
+                       PHP_ADD_EXTENSION_DEP([http], [hash], 0)
+                       AC_DEFINE([HTTP_HAVE_EXT_HASH_EXT_HASH], [1], [Have ext/hash support])
+               ])
+       else
+               AC_MSG_RESULT(disabled)
+       fi
+
 dnl ----
 dnl DONE
 dnl ----
@@ -191,7 +224,8 @@ 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_encoding_api.c"
+               http_info_api.c http_request_method_api.c http_encoding_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])
@@ -199,13 +233,15 @@ 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"
-       PHP_SUBST([PHP_HTTP_HEADERS])
-
-       dnl outside src dir, adds install-http target
-       PHP_ADD_MAKEFILE_FRAGMENT
-       dnl within src dir, installs http headers
-       ifdef([PHP_INSTALL_HEADERS], [PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADER_FILES)], [ ])
+               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)
+       ], [
+               PHP_SUBST([PHP_HTTP_HEADERS])
+               PHP_ADD_MAKEFILE_FRAGMENT
+       ])
 
        AC_DEFINE([HAVE_HTTP], [1], [Have extended HTTP support])
 fi