Merge pull request networkupstools#2287 from jimklimov/libgd-m4

m4/nut_check_libgd.m4: fall back to checking with explicit -lpng …
jimklimov · Jan 29, 2024 · be1b79a · be1b79a
2 parents 1f9ed56 + 99e68f0
commit be1b79a
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/m4/nut_check_libgd.m4 b/m4/nut_check_libgd.m4
@@ -127,9 +127,17 @@ if test -z "${nut_have_libgd_seen}"; then
 				AC_MSG_CHECKING([with gdlib.pc Libs.private])
 				LDFLAGS="$LDFLAGS $_LIBS_PRIVATE"
 				unset ac_cv_search_gdImagePng
-				AC_SEARCH_LIBS(gdImagePng, gd, [], [nut_have_libgd=no])
+				AC_SEARCH_LIBS(gdImagePng, gd, [nut_have_libgd=yes], [nut_have_libgd=no])
 			])
 			unset _LIBS_PRIVATE
+			dnl At least mingw 32-bit builds of the DLL seem to not
+			dnl tell the linker how to get from GD to PNG lib
+			AS_IF([test x"$nut_have_libgd" = xno], [
+				AC_MSG_CHECKING([with explicit -lpng in the loop])
+				LDFLAGS="$LDFLAGS -lgd"
+				unset ac_cv_search_gdImagePng
+				AC_SEARCH_LIBS(gdImagePng, png png16, [nut_have_libgd=yes], [nut_have_libgd=no])
+			])
 		])
 	])