basic support for external libzip

diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
index 5460b6d6bd0173d4ac3e38b5c75370acc58c7229..18bad33c793ce6a85ed3762f2f1cead3bcfac80b 100644 (file)
--- a/ext/zip/config.w32
+++ b/ext/zip/config.w32
@@ -5,6 +5,20 @@ ARG_ENABLE("zip", "ZIP support", "yes");
 
 if (PHP_ZIP != "no") {
        if (CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS_ZIP", "..\\zlib;" + PHP_ZIP) &&
+               CHECK_HEADER_ADD_INCLUDE("zip.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\include;" + PHP_EXTRA_INCLUDES) &&
+               CHECK_HEADER_ADD_INCLUDE("zipconf.h", "CFLAGS_ZIP", PHP_PHP_BUILD + "\\lib\\libzip\\include;" + PHP_EXTRA_LIBS + "\\libzip\\include;" + PHP_ZIP) &&
+               (CHECK_LIB("zlib_a.lib;zlib.lib", "zip", PHP_ZIP) && (PHP_ZIP_SHARED && CHECK_LIB("libzip.lib", "zip", PHP_ZIP) || CHECK_LIB("libzip_a.lib", "zip", PHP_ZIP)))
+       ) {
+               EXTENSION('zip', 'php_zip.c zip_stream.c');
+
+               if (!PHP_ZIP_SHARED) {
+                       AC_DEFINE("ZIP_STATIC", 1);
+               }
+
+               AC_DEFINE('HAVE_ZIP', 1);
+               AC_DEFINE('HAVE_LIBZIP', 1);
+               ADD_FLAG("CFLAGS_ZIP", "/D _WIN32");
+       } else if (CHECK_HEADER_ADD_INCLUDE("zlib.h", "CFLAGS_ZIP", "..\\zlib;" + PHP_ZIP) &&
                CHECK_HEADER_ADD_INCLUDE("zipconf.h", "CFLAGS_ZIP", configure_module_dirname + "\\lib;" + PHP_ZIP) &&
                (((PHP_ZLIB=="no") && (CHECK_LIB("zlib_a.lib", "zip", PHP_ZIP) ||  CHECK_LIB("zlib.lib", "zip", PHP_ZIP))) || 
                        (PHP_ZLIB_SHARED && CHECK_LIB("zlib.lib", "zip", PHP_ZIP)) || (PHP_ZLIB == "yes" && (!PHP_ZLIB_SHARED)))