From 3a71697cc61f1a131dcec073ce4f4e2634e2cb49 Mon Sep 17 00:00:00 2001
From: Darren Salt <devspam@moreofthesa.me.uk>
Date: Tue, 17 Jun 2014 21:52:52 +0100
Subject: Fix detection of and compilation with libcaca 0.99 beta 19.

---
 m4/video_out.m4 | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

(limited to 'm4')

diff --git a/m4/video_out.m4 b/m4/video_out.m4
index e8ff1c45d..734ffa2d9 100644
--- a/m4/video_out.m4
+++ b/m4/video_out.m4
@@ -77,12 +77,20 @@ AC_DEFUN([XINE_VIDEO_OUT_PLUGINS], [
     dnl Color AsCii Art
     XINE_ARG_WITH([caca], [enable support for CACA])
     if test x"$with_caca" != x"no"; then
-        PKG_CHECK_MODULES([CACA], [caca >= 0.99beta14 cucul >= 0.99beta14], [have_caca="yes"], [have_caca="no"])
+        have_cucul=yes
+        PKG_CHECK_MODULES([CACA], [caca >= 0.99beta19],
+                          [have_caca="yes"
+                           have_cucul="no"],
+                          [PKG_CHECK_MODULES([CACA], [caca >= 0.99beta14 cucul >= 0.99beta14], [have_caca="yes"], [have_caca="no"])])
         if test x"$hard_with_caca" = x"yes" && test x"$have_caca" != x"yes"; then
             AC_MSG_ERROR([CACA support requested, but libcaca 0.99 not found])
         fi
     fi
     AM_CONDITIONAL([ENABLE_CACA], [test x"$have_caca" = x"yes"])
+    if test x"$have_caca$have_cucul" = x"yesyes"; then
+        HAVE_CUCUL=1
+        AC_SUBST([HAVE_CUCUL])
+    fi
 
 
     dnl dha (Linux only)
-- 
cgit v1.2.3