Merge branch 'PHP-7.2'

weltling · weltling · commit a8ec35ac38ed · 2018-05-02T17:28:10.000+02:00
* PHP-7.2:
  Fix shared ext/zip build with static dependency lib
diff --git 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);
 		}
 

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,8 @@ if (PHP_ZIP != "no") {`
`10`	`10`	`) {`
`11`	`11`	`EXTENSION('zip', 'php_zip.c zip_stream.c');`
`12`	`12`
`13`		`- if (!PHP_ZIP_SHARED) {`
	`13`	`+ if (get_define("LIBS_ZIP").match("libzip_a.lib")) {`
	`14`	`+ /* Using static dependency lib. */`
`14`	`15`	`AC_DEFINE("ZIP_STATIC", 1);`
`15`	`16`	`}`
`16`	`17`