From 46c7bded3fa23354f52c3656bf8dfbb0f599f5f5 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Thu, 18 Oct 2007 15:22:48 +0100
Subject: Make AM_PATH_XINE ignore xine-config if a libxine.pc for >= 1.1.90 is
 present.

---
 m4/xine.m4 | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'm4')

diff --git a/m4/xine.m4 b/m4/xine.m4
index 74212b486..eb4ef9d20 100644
--- a/m4/xine.m4
+++ b/m4/xine.m4
@@ -65,9 +65,7 @@ AC_DEFUN([AM_PATH_XINE], [
         test x"$XINE_CONFIG" = x"" && XINE_CONFIG="$with_xine_prefix/bin/xine-config"
     fi
 
-    min_xine_version=ifelse([$1], , [0.5.0], [$1])
-    AC_PATH_TOOL([XINE_CONFIG], [xine-config], [no])
-    if test x"$XINE_CONFIG" = x"no"; then
+    if "$PKG_CONFIG" --atleast-version 1.1.90 libxine; then
 	min_xine_version=ifelse([$1], , [1.2.0], [$1])
 	PKG_CHECK_MODULES([XINE], [libxine >= $min_xine_version],
 	    [XINE_VERSION="`"$PKG_CONFIG" --modversion libxine`"
@@ -79,6 +77,8 @@ AC_DEFUN([AM_PATH_XINE], [
 	    $2],
 	    [$3])
     else
+	min_xine_version=ifelse([$1], , [0.5.0], [$1])
+	AC_PATH_TOOL([XINE_CONFIG], [xine-config], [no])
         AC_MSG_CHECKING([for XINE-LIB version >= $min_xine_version])
         XINE_CFLAGS="`$XINE_CONFIG $xine_config_args --cflags`"
         XINE_LIBS="`$XINE_CONFIG $xine_config_args --libs`"
-- 
cgit v1.2.3