[patch] proposed patch

0001-Fix-detecting-libcaca-compile-options.patch (text/plain), 1.69 KB, created by Azamat H. Hackimov on 2021-11-16 01:00:21 UTC

From 803ae6cadcfc27b033e4e7031f5416a6982b333b Mon Sep 17 00:00:00 2001
From: "Azamat H. Hackimov" <[e-mail]>
Date: Tue, 16 Nov 2021 03:48:10 +0300
Subject: [PATCH] Fix detecting libcaca compile options

caca-config produces wrong output on building 32-bit libraries in 64-bit
environment. To fix that, it replaced by standard PKG_CHECK_MODULES
macros.
See https://bugs.gentoo.org/823890
---
 configure.ac | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure.ac b/configure.ac
index 30939111..4872f644 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1603,11 +1603,8 @@ CheckCaca()
                   , enable_video_caca=no)
     if test x$enable_video = xyes -a x$enable_video_caca = xyes; then
         video_caca=no
-        AC_PATH_PROG(CACACONFIG, caca-config, no)
-        if test x$CACACONFIG != xno; then
-            AC_MSG_CHECKING(for libcaca support)
-            CACA_CFLAGS=`$CACACONFIG --cflags`
-            CACA_LDFLAGS=`$CACACONFIG --libs`
+	PKG_CHECK_MODULES([CACA], [caca])
+	if test $pkg_failed == no; then
             save_CFLAGS="$CFLAGS"
             AC_TRY_COMPILE([
              #include <caca.h>
@@ -1616,14 +1613,13 @@ CheckCaca()
              video_caca=yes
             ])
             CFLAGS="$save_CFLAGS"
-            AC_MSG_RESULT($video_caca)
             if test x$video_caca = xyes; then
                 AC_DEFINE(SDL_VIDEO_DRIVER_CACA)
                 EXTRA_CFLAGS="$EXTRA_CFLAGS $CACA_CFLAGS"
-                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LDFLAGS"
+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $CACA_LIBS"
                 SOURCES="$SOURCES $srcdir/src/video/caca/*.c"
             fi
-        fi
+	fi
     fi
 }
 
-- 
2.32.0