From: Michael Wallner <mike@php.net>
Date: Sat, 10 Dec 2005 21:52:50 +0000 (+0000)
Subject: - improve ext/hash detection
X-Git-Tag: RELEASE_0_20_0~29
X-Git-Url: https://git.m6w6.name/?a=commitdiff_plain;h=22ef1d84f0722d4a2d67c827eb3fb24d50134fb4;p=m6w6%2Fext-http

- improve ext/hash detection
---

diff --git a/config.m4 b/config.m4
index 9cb0973..a99a32d 100644
--- a/config.m4
+++ b/config.m4
@@ -172,23 +172,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)