[prev in list] [next in list] [prev in thread] [next in thread] 

List:       xine-cvslog
Subject:    [xine-cvs] HG: xine-lib-1.2: Make AM_PATH_XINE ignore xine-config
From:       Darren Salt <linux () youmustbejoking ! demon ! co ! uk>
Date:       2007-10-18 22:09:14
Message-ID: 9c4596aad5c75d84cf3b.1192717368 () hg ! debian ! org
[Download RAW message or body]

# HG changeset patch
# User Darren Salt <linux@youmustbejoking.demon.co.uk>
# Date 1192717368 -3600
# Node ID 9c4596aad5c75d84cf3b064a26da756416aa25e6
# Parent  58e83c623f865fd5e046ed21770791be0c97b47b
Make AM_PATH_XINE ignore xine-config if a libxine.pc for >= 1.1.90 is present.

diff -r 9c4596aad5c75d84cf3b064a26da756416aa25e6 -r 58e83c623f865fd5e046ed21770791be0c97b47b m4/xine.m4
--- a/m4/xine.m4	Thu Oct 18 15:22:48 2007 +0100
+++ b/m4/xine.m4	Thu Oct 18 15:03:01 2007 +0100
@@ -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`"

-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Xine-cvslog mailing list
Xine-cvslog@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
[prev in list] [next in list] [prev in thread] [next in thread]