merge unmerged changes from php 5.3

diff --git a/ext/phar/config.m4 b/ext/phar/config.m4
index fe8734281f64cced196a08b06d5b561a24d795ad..9dc1badd5a18107cbd78d0678f7882273dfdc32f 100644 (file)
--- 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