com php-src: libzip 1.3.0 supports also bz2 compression: ext/zip/config.w32
| From: | Anatol Belski | Date: | Mon, 04 Sep 2017 11:27:53 +0000 |
| Subject: | com php-src: libzip 1.3.0 supports also bz2 compression: ext/zip/config.w32 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-99240@lists.php.net to get a copy of this message | ||
Commit: b9710873540f98bff8be25ac240d106c15d6b784
Author: Anatol Belski <ab@php.net> Mon, 4 Sep 2017 13:27:09 +0200
Parents: db5b8dbcdfd2642232f7e0c753508f290c8c2da9
Branches: PHP-7.2 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=b9710873540f98bff8be25ac240d106c15d6b784
Log:
libzip 1.3.0 supports also bz2 compression
Changed paths:
M ext/zip/config.w32
Diff:
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
index 906b65f..cdc42bd 100644
--- a/ext/zip/config.w32
+++ b/ext/zip/config.w32
@@ -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))
+ (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))
) {
EXTENSION('zip', 'php_zip.c zip_stream.c');