MFB: fix hash support on windows in ext/phar (Kalle)

diff --git a/ext/phar/config.w32 b/ext/phar/config.w32
index e5a755084eeeef0349b015c259ac61836f43541c..33b90beeaf6b9dd6535aa7ef5b1eabf25d4a9ecd 100644 (file)
--- a/ext/phar/config.w32
+++ b/ext/phar/config.w32
@@ -1,17 +1,16 @@
 // $Id$
 // 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 @@ if (PHP_PHAR != "no") {
                        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);
 }