helly           Tue Nov  4 01:27:52 2008 UTC

  Modified files:              (Branch: PHP_5_3)
    /php-src/ext/phar   config.m4 util.c 
  Log:
  - MFH Fix dependency from Phar to hash
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.m4?r1=1.27.2.7&r2=1.27.2.8&diff_format=u
Index: php-src/ext/phar/config.m4
diff -u php-src/ext/phar/config.m4:1.27.2.7 php-src/ext/phar/config.m4:1.27.2.8
--- php-src/ext/phar/config.m4:1.27.2.7 Thu Oct  9 00:50:46 2008
+++ php-src/ext/phar/config.m4  Tue Nov  4 01:27:52 2008
@@ -1,4 +1,4 @@
-dnl $Id: config.m4,v 1.27.2.7 2008/10/09 00:50:46 cellog Exp $
+dnl $Id: config.m4,v 1.27.2.8 2008/11/04 01:27:52 helly Exp $
 dnl config.m4 for extension phar
 
 PHP_ARG_ENABLE(phar, for phar archive support,
@@ -8,7 +8,9 @@
   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 @@
       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
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/util.c?r1=1.55.2.39&r2=1.55.2.40&diff_format=u
Index: php-src/ext/phar/util.c
diff -u php-src/ext/phar/util.c:1.55.2.39 php-src/ext/phar/util.c:1.55.2.40
--- php-src/ext/phar/util.c:1.55.2.39   Sun Oct 26 05:49:09 2008
+++ php-src/ext/phar/util.c     Tue Nov  4 01:27:52 2008
@@ -18,9 +18,12 @@
   +----------------------------------------------------------------------+
 */
 
-/* $Id: util.c,v 1.55.2.39 2008/10/26 05:49:09 cellog Exp $ */
+/* $Id: util.c,v 1.55.2.40 2008/11/04 01:27:52 helly Exp $ */
 
 #include "phar_internal.h"
+#ifdef PHAR_HASH_OK
+#include "ext/hash/php_hash_sha.h"
+#endif
 
 #ifdef PHAR_HAVE_OPENSSL
 /* OpenSSL includes */



-- 
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php

Reply via email to