[PHP-CVS] svn: /php/php-src/trunk/ext/phar/ config.m4 config.w32

2009-07-25 Thread Greg Beaver 
cellog   Sun, 26 Jul 2009 02:19:58 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=286342

Log:
re-enable phar now that compile and building phar.phar works

Changed paths:
U   php/php-src/trunk/ext/phar/config.m4
U   php/php-src/trunk/ext/phar/config.w32

Modified: php/php-src/trunk/ext/phar/config.m4
===
--- php/php-src/trunk/ext/phar/config.m42009-07-26 02:18:50 UTC (rev 
286341)
+++ php/php-src/trunk/ext/phar/config.m42009-07-26 02:19:58 UTC (rev 
286342)
@@ -2,7 +2,7 @@
 dnl config.m4 for extension phar

 PHP_ARG_ENABLE(phar, for phar archive support,
-[  --enable-phar Enable phar support])
+[  --disable-phar  Disable phar support], yes)

 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)

Modified: php/php-src/trunk/ext/phar/config.w32
===
--- php/php-src/trunk/ext/phar/config.w32   2009-07-26 02:18:50 UTC (rev 
286341)
+++ php/php-src/trunk/ext/phar/config.w32   2009-07-26 02:19:58 UTC (rev 
286342)
@@ -1,7 +1,7 @@
 // $Id$
 // vim:ft=javascript

-ARG_ENABLE(phar, enable phar support, no);
+ARG_ENABLE(phar, disable phar support, yes);
 ARG_ENABLE(phar-native-ssl, enable phar with native OpenSSL support, no);

 if (PHP_PHAR_NATIVE_SSL != no) {

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

[PHP-CVS] svn: /php/php-src/trunk/ext/phar/ config.m4

2009-07-24 Thread Greg Beaver 
cellog   Fri, 24 Jul 2009 21:32:22 +

Revision: http://svn.php.net/viewvc?view=revisionrevision=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.m42009-07-24 21:27:51 UTC (rev 
284722)
+++ php/php-src/trunk/ext/phar/config.m42009-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