[PHP-CVS] cvs: php-src /ext/phar config.w32

2009-05-11 Thread Kalle Sommer Nielsen 
kalle   Mon May 11 06:42:06 2009 UTC

  Modified files:  
/php-src/ext/phar   config.w32 
  Log:
  Fix conditional
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.32r2=1.33diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.32 php-src/ext/phar/config.w32:1.33
--- php-src/ext/phar/config.w32:1.32Sun Mar  1 07:25:24 2009
+++ php-src/ext/phar/config.w32 Mon May 11 06:42:06 2009
@@ -1,4 +1,4 @@
-// $Id: config.w32,v 1.32 2009/03/01 07:25:24 cellog Exp $
+// $Id: config.w32,v 1.33 2009/05/11 06:42:06 kalle Exp $
 // vim:ft=javascript
 
 ARG_ENABLE(phar, enable phar support, no);
@@ -36,7 +36,7 @@
}
}
if (PHP_HASH != no) {
-   if (PHP_HASH_SHARED == no) {
+   if (!PHP_HASH_SHARED) {
AC_DEFINE(PHAR_HASH_OK, 1);
} else {
WARNING('Phar: sha256/sha512 signature support disabled 
if ext/hash is built shared');



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

[PHP-CVS] cvs: php-src /ext/phar config.w32

2009-02-28 Thread Greg Beaver 
cellog  Sun Mar  1 07:07:14 2009 UTC

  Modified files:  
/php-src/ext/phar   config.w32 
  Log:
  MFB: fix hash support on windows in ext/phar (Kalle)
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.30r2=1.31diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.30 php-src/ext/phar/config.w32:1.31
--- php-src/ext/phar/config.w32:1.30Sun Aug 31 20:54:27 2008
+++ php-src/ext/phar/config.w32 Sun Mar  1 07:07:14 2009
@@ -1,17 +1,16 @@
-// $Id: config.w32,v 1.30 2008/08/31 20:54:27 sfox Exp $
+// $Id: config.w32,v 1.31 2009/03/01 07:07:14 cellog Exp $
 // 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_PHAR = PHP_PHAR_NATIVE_SSL;
-   PHP_PHAR_SHARED = PHP_PHAR_NATIVE_SSL_SHARED;
 }
 
 if (PHP_PHAR != no) {
EXTENSION(phar, dirstream.c func_interceptors.c phar.c phar_object.c 
phar_path_check.c stream.c tar.c util.c zip.c);
-   if (PHP_PHAR_SHARED) {
+   if (PHP_PHAR_SHARED || (PHP_PHAR_NATIVE_SSL_SHARED  
PHP_SNAPSHOT_BUILD == no)) {
ADD_FLAG(CFLAGS_PHAR, /D COMPILE_DL_PHAR );
}
if (PHP_PHAR_NATIVE_SSL != no) {
@@ -36,5 +35,12 @@
STDOUT.WriteLine('Native OpenSSL support in 
Phar disabled');
}
}
+   if (PHP_HASH != no) {
+   if (PHP_HASH_SHARED == no) {
+   AC_DEFINE(PHAR_HASH_OK, 1);
+   } else {
+   WARNING('Phar: sha256/sha512 signature support disabled 
if ext/hash is built shared');
+   }
+   }
ADD_EXTENSION_DEP('phar', 'spl', true);
 }



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

[PHP-CVS] cvs: php-src /ext/phar config.w32

2009-02-28 Thread Greg Beaver 
cellog  Sun Mar  1 07:25:24 2009 UTC

  Modified files:  
/php-src/ext/phar   config.w32 
  Log:
  re-disable phar in HEAD on windows
  
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.31r2=1.32diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.31 php-src/ext/phar/config.w32:1.32
--- php-src/ext/phar/config.w32:1.31Sun Mar  1 07:07:14 2009
+++ php-src/ext/phar/config.w32 Sun Mar  1 07:25:24 2009
@@ -1,7 +1,7 @@
-// $Id: config.w32,v 1.31 2009/03/01 07:07:14 cellog Exp $
+// $Id: config.w32,v 1.32 2009/03/01 07:25:24 cellog Exp $
 // vim:ft=javascript
 
-ARG_ENABLE(phar, disable phar support, yes);
+ARG_ENABLE(phar, enable phar support, no);
 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