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

sfox Mon Jul 7 01:13:14 2008 UTC Modified files: (Branch: PHP_5_3) /php-src/ext/phar config.w32 Log: - Fixed config.w32 to keep Elizabeth happy - NB This whole lot still might disappear, OpenSSL patch review pending http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.3&r2=1.27.2.4&diff_format=u Index: php-src/ext/phar/config.w32 diff -u php-src/ext/phar/config.w32:1.27.2.3 php-src/ext/phar/config.w32:1.27.2.4 --- php-src/ext/phar/config.w32:1.27.2.3 Mon Jun 23 19:18:01 2008 +++ php-src/ext/phar/config.w32 Mon Jul 7 01:13:14 2008 @@ -1,12 +1,12 @@ -// $Id: config.w32,v 1.27.2.3 2008/06/23 19:18:01 sfox Exp $ +// $Id: config.w32,v 1.27.2.4 2008/07/07 01:13:14 sfox Exp $ // vim:ft=javascript ARG_ENABLE("phar", "disable phar support", "yes"); -ARG_ENABLE("phar-ssl", "enable phar with native OpenSSL support", "no"); +ARG_ENABLE("phar-native-ssl", "enable phar with native OpenSSL support", "no"); -if (PHP_PHAR_SSL != "no") { - PHP_PHAR = PHP_PHAR_SSL; - PHP_PHAR_SHARED = PHP_PHAR_SSL_SHARED; +if (PHP_PHAR_NATIVE_SSL != "no") { + PHP_PHAR = PHP_PHAR_NATIVE_SSL; + PHP_PHAR_SHARED = PHP_PHAR_NATIVE_SSL_SHARED; } if (PHP_PHAR != "no") { @@ -14,9 +14,25 @@ if (PHP_PHAR_SHARED) { ADD_FLAG("CFLAGS_PHAR", "/D COMPILE_DL_PHAR "); } - if (PHP_PHAR_SSL != "no") { - ADD_FLAG("LIBS_PHAR", "libeay32.lib"); - AC_DEFINE('PHAR_HAVE_OPENSSL', 1); + if (PHP_PHAR_NATIVE_SSL != "no") { + if (CHECK_LIB("libeay32st.lib", "phar")) { + /* We don't really need GDI for this, but there's no + way to avoid linking it in the static openssl build */ + ADD_FLAG("LIBS_PHAR", "libeay32st.lib gdi32.lib"); + if (PHP_DEBUG == "no") { + /* Silence irrelevant-to-us warning in release builds */ + ADD_FLAG("LDFLAGS_PHAR", "/IGNORE:4089 "); + } + AC_DEFINE('PHAR_HAVE_OPENSSL', 1); + STDOUT.WriteLine(' Native OpenSSL support in Phar enabled'); + } else { + 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) { + AC_DEFINE('PHAR_HAVE_OPENSSL', 1); + } } ADD_EXTENSION_DEP('phar', 'spl', true); }