X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=169aa1561d2b983a9974f13366aa8da28c91503c;hp=3b3dfddd8ce08a68af0d9b9dc3a714f97897c259;hb=9ae4e3a3f75d88489101f237848658b6b54f006a;hpb=edc84b40eb2c5be04492fa98fec5833a030782eb

diff --git a/config.m4 b/config.m4
index 3b3dfdd..169aa15 100644
--- a/config.m4
+++ b/config.m4
@@ -46,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
@@ -77,8 +77,21 @@ 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
@@ -159,6 +172,7 @@ 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
@@ -166,26 +180,30 @@ dnl ----
 			fi
 			old_CPPFLAGS=$CPPFLAGS
 			CPPFLAGS=$INCLUDES
-			AC_CHECK_HEADER([php_hash.h], [
-				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_DEFINE([HTTP_HAVE_HASH_EXT_HASH], [1], [Have ext/hash support])
 				], [ 
-					AC_CHECK_HEADER([ext/hash/php_hash.h], [
-						AC_DEFINE([HTTP_HAVE_EXT_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 ----