ALT Linux repositórios
Group :: Sistema/Servidores
RPM: nut
Main Changelog Spec Patches Sources Download Gear Bugs e FR Repocop
Patch: nut-2.8.0-alt-gdlib.patch
Download
Download
From 5bc98e4e7ea7d57812ade2a925f7297796426871 Mon Sep 17 00:00:00 2001
From: Elizaveta Morozova <morozovaes@altlinux.org>
Date: Thu, 2 Mar 2023 14:06:54 +0300
Subject: [PATCH] nut-2.8.0-alt-gdlib
---
m4/nut_check_libgd.m4 | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/m4/nut_check_libgd.m4 b/m4/nut_check_libgd.m4
index b6f58efcb..29fe52831 100644
--- a/m4/nut_check_libgd.m4
+++ b/m4/nut_check_libgd.m4
@@ -33,7 +33,7 @@ if test -z "${nut_have_libgd_seen}"; then
[CFLAGS="`$PKG_CONFIG --silence-errors --cflags gdlib 2>/dev/null`"
LIBS="`$PKG_CONFIG --silence-errors --libs gdlib 2>/dev/null`"
],
- [dnl Initial defaults. These are only used if gdlib-config is
+ [dnl Initial defaults. These are only used if pkg-config is
dnl unusable and the user fails to pass better values in --with
dnl arguments
CFLAGS=""
@@ -58,8 +58,8 @@ if test -z "${nut_have_libgd_seen}"; then
])
AS_IF([test x"$GDLIB_CONFIG" != xnone],
- [AC_MSG_CHECKING(for gd version via ${GDLIB_CONFIG})
- GD_VERSION="`${GDLIB_CONFIG} --version 2>/dev/null`"
+ [AC_MSG_CHECKING(for gd version via ${PKG_CONFIG})
+ GD_VERSION="`${PKG_CONFIG} --version 2>/dev/null`"
if test "$?" != "0" -o -z "${GD_VERSION}"; then
GD_VERSION="none"
fi
@@ -71,13 +71,13 @@ if test -z "${nut_have_libgd_seen}"; then
none)
;;
2.0.5 | 2.0.6 | 2.0.7)
- AC_MSG_WARN([[gd ${GD_VERSION} detected, unable to use ${GDLIB_CONFIG} script]])
+ AC_MSG_WARN([[gd ${GD_VERSION} detected, unable to use ${PKG_CONFIG} script]])
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} --includes 2>/dev/null`"
+ LDFLAGS="`${PKG_CONFIG} --ldflags 2>/dev/null`"
+ LIBS="`${PKG_CONFIG} --libs 2>/dev/null`"
;;
esac
]
--
2.33.5