]> granicus.if.org Git - php/commitdiff
Fixed bug #76564 ext/zip link issues
authorAnatol Belski <ab@php.net>
Tue, 3 Jul 2018 13:45:01 +0000 (15:45 +0200)
committerAnatol Belski <ab@php.net>
Tue, 3 Jul 2018 13:45:01 +0000 (15:45 +0200)
Add zlib for linking directly, so then ext/zlib is not required.

ext/zip/config.w32

index 76231bee370e6501ccd0370f59d13bf43a22c31d..e6cd587bf83dbbaa835ca9db45b839621f019bbc 100644 (file)
@@ -6,7 +6,7 @@ ARG_ENABLE("zip", "ZIP support", "yes");
 if (PHP_ZIP != "no") {
        if (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) &&
-               (PHP_ZIP_SHARED && CHECK_LIB("libzip.lib", "zip", PHP_ZIP) || CHECK_LIB("libzip_a.lib", "zip", PHP_ZIP) && CHECK_LIB("libbz2_a.lib", "zip", PHP_ZIP))
+               (PHP_ZIP_SHARED && CHECK_LIB("libzip.lib", "zip", PHP_ZIP) || CHECK_LIB("libzip_a.lib", "zip", PHP_ZIP) && CHECK_LIB("libbz2_a.lib", "zip", PHP_ZIP) && CHECK_LIB("zlib_a.lib", "zip", PHP_ZIP))
        ) {
                EXTENSION('zip', 'php_zip.c zip_stream.c');