Merge pull request #1355 from sjinks/issue-1350

Fix #1350
phalcon · Oct 9, 2013 · f90743d · f90743d
2 parents a01c8b7 + b7bf4a5
commit f90743d
Show file tree

Hide file tree

Showing 14 changed files with 4,461 additions and 4,155 deletions.
diff --git a/build/32bits/config.m4 b/build/32bits/config.m4
@@ -69,6 +69,23 @@ if test "$PHP_PHALCON" = "yes"; then
 		[[#include "php_config.h"]]
 	)
 
+	AC_CHECK_DECL(
+		[HAVE_HASH_EXT],
+		[
+			AC_CHECK_HEADERS(
+				[ext/hash/php_hash.h],
+				[
+					PHP_ADD_EXTENSION_DEP([phalcon], [hash])
+					AC_DEFINE([PHALCON_USE_PHP_HASH], [1], [Whether PHP hash extension is present at compile time])
+				],
+				,
+				[[#include "main/php.h"]]
+			)
+		],
+		,
+		[[#include "php_config.h"]]
+	)
+
 	CPPFLAGS=$old_CPPFLAGS
 
 	PHP_ADD_MAKEFILE_FRAGMENT