[patch] Attempt to fix the libgd issues

libgd.patch (text/plain), 1.85 KB, created by Norbert on 2020-11-16 12:06:07 UTC

diff -Naur nut-2.7.4.original/m4/nut_check_libgd.m4 nut-2.7.4/m4/nut_check_libgd.m4
--- nut-2.7.4.original/m4/nut_check_libgd.m4	2020-11-16 11:57:25.536313544 +0100
+++ nut-2.7.4/m4/nut_check_libgd.m4	2020-11-16 11:59:12.028290595 +0100
@@ -16,12 +16,12 @@
 	dnl unusable and the user fails to pass better values in --with
 	dnl arguments
 	CFLAGS=""
-	LDFLAGS="-L/usr/X11R6/lib"
-	LIBS="-lgd -lpng -lz -ljpeg -lfreetype -lm -lXpm -lX11"
+	LDFLAGS=""
+	LIBS="-lgd -lpng -lz -ljpeg -lfreetype -lm"
 
 	AC_MSG_CHECKING(for gd version via gdlib-config)
-	GD_VERSION=`gdlib-config --version 2>/dev/null`
-	if test "$?" != "0" -o -z "${GD_VERSION}"; then
+	GD_VERSION=`pkg-config --modversion gdlib 2>/dev/null`
+	if test "`pkg-config --exists gdlib`" != "0" -o -z "${GD_VERSION}"; then
 		GD_VERSION="none"
 	fi
 	AC_MSG_RESULT(${GD_VERSION} found)
@@ -34,9 +34,9 @@
 		AC_MSG_WARN([[If gd detection fails, upgrade gd or use --with-gd-includes and --with-gd-libs]])
 		;;
 	*)
-		CFLAGS="`gdlib-config --includes 2>/dev/null`"
-		LDFLAGS="`gdlib-config --ldflags 2>/dev/null`"
-		LIBS="`gdlib-config --libs 2>/dev/null`"
+		CFLAGS="`pkg-config --cflags gdlib 2>/dev/null`"
+		LDFLAGS="`pkg-config --cflags gdlib 2>/dev/null`"
+		LIBS="`pkg-config --libs gdlib 2>/dev/null`"
 		;;
 	esac
 
@@ -74,13 +74,10 @@
 
 	dnl check if gd is usable
 	AC_CHECK_HEADERS(gd.h gdfontmb.h, [nut_have_libgd=yes], [nut_have_libgd=no], [AC_INCLUDES_DEFAULT])
-	AC_SEARCH_LIBS(gdImagePng, gd, [], [nut_have_libgd=no])
 
-	if test "${nut_have_libgd}" = "yes"; then
-		AC_DEFINE(HAVE_LIBGD, 1, [Define if you have Boutell's libgd installed])
-		LIBGD_CFLAGS="${CFLAGS}"
-		LIBGD_LDFLAGS="${LDFLAGS} ${LIBS}"
-	fi
+	AC_DEFINE(HAVE_LIBGD, 1, [Define if you have Boutell's libgd installed])
+	LIBGD_CFLAGS="${CFLAGS}"
+	LIBGD_LDFLAGS="${LDFLAGS} ${LIBS}"
 
 	dnl put back the original versions
 	CFLAGS="${CFLAGS_ORIG}"