diff --git a/ext/phar/config.m4 b/ext/phar/config.m4 index 5e32c5b6f28..2ac7f3dd813 100644 --- a/ext/phar/config.m4 +++ b/ext/phar/config.m4 @@ -8,7 +8,9 @@ if test "$PHP_PHAR" != "no"; then PHP_NEW_EXTENSION(phar, util.c tar.c zip.c stream.c func_interceptors.c dirstream.c phar.c phar_object.c phar_path_check.c, $ext_shared) AC_MSG_CHECKING([for phar openssl support]) if test "$PHP_HASH_SHARED" != "yes"; then - AC_DEFINE(PHAR_HASH_OK,1,[ ]) + if test "$PHP_HASH" != "no"; then + AC_DEFINE(PHAR_HASH_OK,1,[ ]) + fi else AC_MSG_WARN([Phar: sha256/sha512 signature support disabled if ext/hash is built shared]) fi @@ -22,6 +24,7 @@ if test "$PHP_PHAR" != "no"; then AC_MSG_RESULT([no]) fi fi + PHP_ADD_EXTENSION_DEP(phar, hash, true) PHP_ADD_EXTENSION_DEP(phar, spl, true) PHP_ADD_MAKEFILE_FRAGMENT fi diff --git a/ext/phar/util.c b/ext/phar/util.c index 5c57e72e418..cf4fa11e2b2 100644 --- a/ext/phar/util.c +++ b/ext/phar/util.c @@ -21,6 +21,9 @@ /* $Id$ */ #include "phar_internal.h" +#ifdef PHAR_HASH_OK +#include "ext/hash/php_hash_sha.h" +#endif #ifdef PHAR_HAVE_OPENSSL /* OpenSSL includes */