cvs: php-src(PHP_5_3) /ext/phar config.w32

cellog Mon Aug 18 14:58:03 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.w32 Log: fix windows build when building phar shared with native-ssl disabled (you can't use the symbols directly if openssl is built shared or is not built at all) http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.4&r2=1.27.2.5&diff_format=u Index: php-src/ext/phar/config.w32 diff -u php-src/ext/phar/config.w32:1.27.2.4 php-src/ext/phar/config.w32:1.27.2.5 --- php-src/ext/phar/config.w32:1.27.2.4 Mon Jul 7 01:13:14 2008 +++ php-src/ext/phar/config.w32 Mon Aug 18 14:58:03 2008 @@ -1,4 +1,4 @@ -// $Id: config.w32,v 1.27.2.4 2008/07/07 01:13:14 sfox Exp $ +// $Id: config.w32,v 1.27.2.5 2008/08/18 14:58:03 cellog Exp $ // vim:ft=javascript ARG_ENABLE("phar", "disable phar support", "yes"); @@ -29,9 +29,11 @@ WARNING('Could not enable native OpenSSL support in Phar'); } } else { - /* If ext/openssl is built-in we can at least use the API directly */ - if (PHP_OPENSSL != "no" && !PHP_OPENSSL_SHARED) { + if (PHP_OPENSSL != "no" && !PHP_OPENSSL_SHARED && !PHP_PHAR_SHARED) { AC_DEFINE('PHAR_HAVE_OPENSSL', 1); + STDOUT.WriteLine(' Native OpenSSL support in Phar enabled'); + } else { + STDOUT.WriteLine(' Native OpenSSL support in Phar disabled'); } } ADD_EXTENSION_DEP('phar', 'spl', true);