diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-10-18 15:22:48 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2007-10-18 15:22:48 +0100 |
| commit | 46c7bded3fa23354f52c3656bf8dfbb0f599f5f5 (patch) | |
| tree | d5f1e2f2d7d09d0b793894dbf180b9681dd001e3 /m4 | |
| parent | 53324a29669c844aa754348063f9435f39a6c99a (diff) | |
| download | xine-lib-46c7bded3fa23354f52c3656bf8dfbb0f599f5f5.tar.gz xine-lib-46c7bded3fa23354f52c3656bf8dfbb0f599f5f5.tar.bz2 | |
Make AM_PATH_XINE ignore xine-config if a libxine.pc for >= 1.1.90 is present.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/xine.m4 | 6 |
1 files changed, 3 insertions, 3 deletions
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`" |