Windows: allow GD ext without avif.dll

Jan-E · cmb69 · commit 0c89edac3a64 · 2021-06-30T23:01:09.000+02:00
Closes GH-7200.
diff --git a/ext/gd/config.w32 b/ext/gd/config.w32
@@ -32,7 +32,11 @@ if (PHP_GD != "no") {
 			}
 		}
 		if (PHP_LIBAVIF != "no") {
-			if (CHECK_LIB("avif.lib", "gd", PHP_GD) &&
+			if (CHECK_LIB("avif_a.lib", "gd", PHP_GD) &&
+				CHECK_LIB("aom_a.lib", "gd", PHP_GD) &&
+				CHECK_HEADER_ADD_INCLUDE("avif.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\avif")) {
+				ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBAVIF /D HAVE_GD_AVIF");
+			} else if (CHECK_LIB("avif.lib", "gd", PHP_GD) &&
 				CHECK_HEADER_ADD_INCLUDE("avif.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\avif")) {
 				ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBAVIF /D HAVE_GD_AVIF");
 			} else {

Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,11 @@ if (PHP_GD != "no") {`
`32`	`32`	`}`
`33`	`33`	`}`
`34`	`34`	`if (PHP_LIBAVIF != "no") {`
`35`		`- if (CHECK_LIB("avif.lib", "gd", PHP_GD) &&`
	`35`	`+ if (CHECK_LIB("avif_a.lib", "gd", PHP_GD) &&`
	`36`	`+ CHECK_LIB("aom_a.lib", "gd", PHP_GD) &&`
	`37`	`+ CHECK_HEADER_ADD_INCLUDE("avif.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\avif")) {`
	`38`	`+ ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBAVIF /D HAVE_GD_AVIF");`
	`39`	`+ } else if (CHECK_LIB("avif.lib", "gd", PHP_GD) &&`
`36`	`40`	`CHECK_HEADER_ADD_INCLUDE("avif.h", "CFLAGS_GD", PHP_GD + ";" + PHP_PHP_BUILD + "\\include\\avif")) {`
`37`	`41`	`ADD_FLAG("CFLAGS_GD", "/D HAVE_LIBAVIF /D HAVE_GD_AVIF");`
`38`	`42`	`} else {`