add needed define back into config.w32, make zip required mod on win32, remove lib...

diff --git a/ext/phar/config.w32 b/ext/phar/config.w32
index cc8169c977b509ed085d7998aefd8c878f004e3d..96d2368a7fe6b2a2fff24342a75203d6dd64b268 100644 (file)
--- a/ext/phar/config.w32
+++ b/ext/phar/config.w32
@@ -5,13 +5,14 @@ ARG_ENABLE("phar", "enable phar support", "no");
 
 if (PHP_PHAR != "no") {
        EXTENSION("phar", "tar.c zip.c stream.c dirstream.c func_interceptors.c phar.c phar_object.c phar_path_check.c");
-       ADD_EXTENSION_DEP('phar', 'zip');
        if (PHP_ZIP_SHARED) {
                ADD_FLAG("CFLAGS_PHAR", "/D COMPILE_DL_ZIP ");
        }
        if (PHP_PHAR_SHARED) {
                ADD_FLAG("CFLAGS_PHAR", "/D COMPILE_DL_PHAR ");
        }
+       AC_DEFINE('HAVE_PHAR_ZIP', 1);
+       ADD_EXTENSION_DEP('phar', 'zip');
        ADD_EXTENSION_DEP('phar', 'zlib', true);
        ADD_EXTENSION_DEP('phar', 'bz2', true);
        ADD_EXTENSION_DEP('phar', 'spl', true);

diff --git a/ext/phar/phar.c b/ext/phar/phar.c
index ecc318f388c1a97a02fc13ed195b2a934838c492..92c63dd5d6e072a11e498ecf0b5b9ea46285bf31 100644 (file)
--- a/ext/phar/phar.c
+++ b/ext/phar/phar.c
@@ -3332,7 +3332,11 @@ PHP_MINFO_FUNCTION(phar) /* {{{ */
  */
 static zend_module_dep phar_deps[] = {
 #if HAVE_PHAR_ZIP
+# ifdef PHP_WIN32
+       ZEND_MOD_REQUIRED("zip")
+# else
        ZEND_MOD_OPTIONAL("zip")
+# endif
 #endif
        ZEND_MOD_OPTIONAL("zlib")
        ZEND_MOD_OPTIONAL("bz2")