diff options
| author | Steph Fox <sfox@php.net> | 2008-09-01 16:29:38 +0000 |
|---|---|---|
| committer | Steph Fox <sfox@php.net> | 2008-09-01 16:29:38 +0000 |
| commit | 94dcaa27fba205aa6aedb1409a817a3c5d4285d8 (patch) | |
| tree | f32acd4d818f161c10494080c1f53eaa9dfa1b9b /ext/phar/config.w32 | |
| parent | e36c24fc508e6cb977423ed5fbb269dd06c7c23d (diff) | |
| download | php-git-94dcaa27fba205aa6aedb1409a817a3c5d4285d8.tar.gz | |
- Fix the fix (sorry, missed this until now)
Diffstat (limited to 'ext/phar/config.w32')
| -rw-r--r-- | ext/phar/config.w32 | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/ext/phar/config.w32 b/ext/phar/config.w32 index a5d962082c..c9bef79209 100644 --- a/ext/phar/config.w32 +++ b/ext/phar/config.w32 @@ -1,18 +1,16 @@ // $Id$ // 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") { |