X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=6b79648958715b54271ddb79bdf7bd77ac5e8753;hp=ff1f707aab3d0f413dd1235ea628bc788082b77a;hb=7fef44c902c86eebce30f36003a27905fbaeba65;hpb=589a7ccffbfdb31c8a8ab9aca5ba22299e2690a7

diff --git a/config.m4 b/config.m4
index ff1f707..6b79648 100644
--- 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])
@@ -49,7 +46,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,24 +77,37 @@ 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`
 		
+		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
+		if test "$CURL_SSL" = "SSL"; then
 			AC_MSG_RESULT([yes])
 			AC_DEFINE([HTTP_HAVE_SSL], [1], [ ])
 			
 			AC_MSG_CHECKING([for SSL library used])
 			CURL_SSL_FLAVOUR=
 			for i in $CURL_LIBS; do
-				if test "$i" == "-lssl"; then
+				if test "$i" = "-lssl"; then
 					CURL_SSL_FLAVOUR="openssl"
 					AC_MSG_RESULT([openssl])
 					AC_DEFINE([HTTP_HAVE_OPENSSL], [1], [ ])
 					AC_CHECK_HEADERS([openssl/crypto.h])
 					break
-				elif test "$i" == "-lgnutls"; then
+				elif test "$i" = "-lgnutls"; then
 					CURL_SSL_FLAVOUR="gnutls"
 					AC_MSG_RESULT([gnutls])
 					AC_DEFINE([HTTP_HAVE_GNUTLS], [1], [ ])
@@ -133,31 +143,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 +168,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 +214,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 +223,14 @@ 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])
+		php_http_encoding_api.h phpstr/phpstr.h missing.h php_http_request_body_api.h"
 
-	dnl outside src dir
-	PHP_ADD_MAKEFILE_FRAGMENT
-	dnl within src dir
-	ifdef([PHP_INSTALL_HEADERS], [PHP_INSTALL_HEADERS(ext/http, $PHP_HTTP_HEADER_FILES)], [ ])
+	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