com php-src: external libzip neither requires zlib.h nor lib: ext/zip/config.w32
[email protected] (Anatol Belski)
| Newsgroups | php.cvs |
|---|---|
| Message-ID | <[email protected]> |
Commit: 3c750d91ee9eeba00563a7a2d94a7470406b1b7e Author: Anatol Belski <[email protected]> Tue, 4 Apr 2017 16:32:29 +0200 Parents: c3e7a2a46156c094cc660276c2e99cb89e089a25 Branches: master Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=3c750d91ee9eeba00563a7a2d94a7470406b1b7e Log: external libzip neither requires zlib.h nor lib Changed paths: M ext/zip/config.w32 Diff: diff --git a/ext/zip/config.w32 b/ext/zip/config.w32 index 18bad33..4a41075 100644 --- a/ext/zip/config.w32 +++ b/ext/zip/config.w32 @@ -4,10 +4,9 @@ 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) && + 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) && - (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))) + (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');