summaryrefslogtreecommitdiff
path: root/ext/zip
diff options
context:
space:
mode:
authorAnatol Belski <ab@php.net>2018-05-02 17:28:10 +0200
committerAnatol Belski <ab@php.net>2018-05-02 17:28:10 +0200
commita8ec35ac38ed95bed06e24541a431d5b9c07e129 (patch)
tree7a90482a6c44d2ad73c0e5ed4a7718aea144a6e4 /ext/zip
parentdbea6e154d95e8aa4393dd517825a2da5de435f2 (diff)
parentafc3f6e8d58248594f9ceb47a2c08fb488a794e6 (diff)
downloadphp-git-a8ec35ac38ed95bed06e24541a431d5b9c07e129.tar.gz
Merge branch 'PHP-7.2'
* PHP-7.2: Fix shared ext/zip build with static dependency lib
Diffstat (limited to 'ext/zip')
-rw-r--r--ext/zip/config.w323
1 files changed, 2 insertions, 1 deletions
diff --git a/ext/zip/config.w32 b/ext/zip/config.w32
index 010237267c..11c299a253 100644
--- a/ext/zip/config.w32
+++ b/ext/zip/config.w32
@@ -10,7 +10,8 @@ if (PHP_ZIP != "no") {
) {
EXTENSION('zip', 'php_zip.c zip_stream.c');
- if (!PHP_ZIP_SHARED) {
+ if (get_define("LIBS_ZIP").match("libzip_a.lib")) {
+ /* Using static dependency lib. */
AC_DEFINE("ZIP_STATIC", 1);
}