From 4c121523aa506b1d011a5cf4ab18b79844e31b1d Mon Sep 17 00:00:00 2001
From: orbea <orbea@riseup.net>
Date: Sat, 27 Jul 2019 00:56:38 -0700
Subject: [PATCH] qb: Use check_val for caca and sixel.

---
 Makefile.common   | 4 +++-
 qb/config.libs.sh | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/Makefile.common b/Makefile.common
index 2238365813..6e4b08d430 100644
--- a/Makefile.common
+++ b/Makefile.common
@@ -1108,7 +1108,8 @@ endif
 ifeq ($(HAVE_CACA), 1)
    DEFINES += -DHAVE_CACA
    OBJ += gfx/drivers/caca_gfx.o gfx/drivers_font/caca_font.o
-   LIBS += -lcaca
+   LIBS += $(CACA_LIBS)
+   DEF_FLAGS += $(CACA_CFLAGS)
 
    ifeq ($(HAVE_MENU_COMMON), 1)
       OBJ += menu/drivers_display/menu_display_caca.o
@@ -1121,6 +1122,7 @@ ifeq ($(HAVE_SIXEL), 1)
    OBJ += gfx/drivers/sixel_gfx.o gfx/drivers_font/sixel_font.o \
           gfx/drivers_context/sixel_ctx.o
    LIBS += $(SIXEL_LIBS)
+   DEF_FLAGS += $(SIXEL_CFLAGS)
 
    ifeq ($(HAVE_MENU_COMMON), 1)
       OBJ += menu/drivers_display/menu_display_sixel.o
diff --git a/qb/config.libs.sh b/qb/config.libs.sh
index 41c0e7a197..22413ab19d 100644
--- a/qb/config.libs.sh
+++ b/qb/config.libs.sh
@@ -196,8 +196,8 @@ if [ "$HAVE_DYLIB" = 'no' ] && [ "$HAVE_DYNAMIC" = 'yes' ]; then
 fi
 
 check_val '' ALSA -lasound alsa alsa '' '' false
-check_lib '' CACA -lcaca
-check_lib '' SIXEL -lsixel
+check_val '' CACA -lcaca '' caca '' '' false
+check_val '' SIXEL -lsixel '' libsixel 1.6.0 '' false
 
 check_macro AUDIOIO AUDIO_SETINFO sys/audioio.h