cvs: php-src(PHP_5_3) /ext/phar config.w32
| From: | Steph Fox | Date: | Mon, 01 Sep 2008 16:29:38 +0000 |
| Subject: | cvs: php-src(PHP_5_3) /ext/phar config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-52887@lists.php.net to get a copy of this message | ||
sfox Mon Sep 1 16:29:38 2008 UTC
Modified files: (Branch: PHP_5_3)
/php-src/ext/phar config.w32
Log:
- Fix the fix (sorry, missed this until now)
http://cvs.php.net/viewvc.cgi/php-src/ext/phar/config.w32?r1=1.27.2.6&r2=1.27.2.7&diff_format=u
Index: php-src/ext/phar/config.w32
diff -u php-src/ext/phar/config.w32:1.27.2.6 php-src/ext/phar/config.w32:1.27.2.7
--- php-src/ext/phar/config.w32:1.27.2.6 Sun Aug 31 19:51:49 2008
+++ php-src/ext/phar/config.w32 Mon Sep 1 16:29:38 2008
@@ -1,18 +1,16 @@
-// $Id: config.w32,v 1.27.2.6 2008/08/31 19:51:49 cellog Exp $
+// $Id: config.w32,v 1.27.2.7 2008/09/01 16:29:38 sfox Exp $
// vim:ft=javascript
-// this next line should be changed back to "yes" after fixes are committed to the
snapshot build process
-ARG_ENABLE("phar", "disable phar support", false);
+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") {