X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-http;a=blobdiff_plain;f=config.m4;h=5d6e492659f25474fb3b2a86b70a7e9ef66bcbd1;hp=1e8eff1a44d228fa434bebd4d35264ecd3e9929b;hb=1c7ba6f10ddb2a20de8d89f415e2750316b76f2c;hpb=dc7248a073febcade23e6a1a296ab1b2bb752298

diff --git a/config.m4 b/config.m4
index 1e8eff1..5d6e492 100644
--- a/config.m4
+++ b/config.m4
@@ -159,7 +159,37 @@ dnl ----
 dnl HASH
 dnl ----
 
-	dnl TODO
+	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_CHECK_HEADER([php_hash.h], 
+			[
+				AC_DEFINE([HTTP_HAVE_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])
+						], [ 
+						])
+					])
+			])
+			CPPFLAGS=$old_CPPFLAGS;
+		fi
+	elif test "$PHP_HASH" != "no" && test "x$PHP_HASH" != "x"; then
+		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])
+		], [
+		])
+	fi
 
 dnl ----
 dnl DONE
@@ -179,12 +209,13 @@ dnl ----
 		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_HEADERS)], [ ])
+	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