cellog Fri, 24 Jul 2009 21:32:22 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=284723
Log:
merge unmerged changes from php 5.3
Changed paths:
U php/php-src/trunk/ext/phar/config.m4
Modified: php/php-src/trunk/ext/phar/config.m4
===================================================================
--- php/php-src/trunk/ext/phar/config.m4 2009-07-24 21:27:51 UTC (rev
284722)
+++ php/php-src/trunk/ext/phar/config.m4 2009-07-24 21:32:22 UTC (rev
284723)
@@ -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
--
PHP CVS Mailing List (http://www.php.net/)
To unsubscribe, visit: http://www.php.net/unsub.php
