diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-14 15:12:25 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-14 15:12:25 +0000 |
| commit | abd0a463dca3cdc98d11c7ff811a9be3099d01cc (patch) | |
| tree | 3dee9564a8e7ba68c21c16844af327727b36ce0a /m4 | |
| parent | 09e2ba368cb0b68e9b91d4b78709c8efa044c538 (diff) | |
| parent | 841473467fd19e4fa4e255d9e17af526ecee5ac8 (diff) | |
| download | xine-lib-abd0a463dca3cdc98d11c7ff811a9be3099d01cc.tar.gz xine-lib-abd0a463dca3cdc98d11c7ff811a9be3099d01cc.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libspudec/xine_spu_decoder.c => src/spu_dec/spu_decoder.c
rename : src/libspudec/spu.c => src/spu_dec/spudec.c
rename : src/libspudec/spu.h => src/spu_dec/spudec.h
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/xine.m4 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/m4/xine.m4 b/m4/xine.m4 index 02a5e6d8e..ec5739e0a 100644 --- a/m4/xine.m4 +++ b/m4/xine.m4 @@ -82,14 +82,14 @@ AC_DEFUN([AM_PATH_XINE], [ 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`" - XINE_VERSION="`$XINE_CONFIG $xine_config_args --version`" - XINE_ACFLAGS="`$XINE_CONFIG $xine_config_args --acflags`" - xine_data_dir="`$XINE_CONFIG $xine_config_args --datadir`" - xine_script_dir="`$XINE_CONFIG $xine_config_args --scriptdir`" - xine_plugin_dir="`$XINE_CONFIG $xine_config_args --plugindir`" - xine_locale_dir="`$XINE_CONFIG $xine_config_args --localedir`" + XINE_CFLAGS="`$XINE_CONFIG $xine_config_args --cflags 2>/dev/null`" + XINE_LIBS="`$XINE_CONFIG $xine_config_args --libs 2>/dev/null`" + XINE_VERSION="`$XINE_CONFIG $xine_config_args --version 2>/dev/null`" + XINE_ACFLAGS="`$XINE_CONFIG $xine_config_args --acflags 2>/dev/null`" + xine_data_dir="`$XINE_CONFIG $xine_config_args --datadir 2>/dev/null`" + xine_script_dir="`$XINE_CONFIG $xine_config_args --scriptdir 2>/dev/null`" + xine_plugin_dir="`$XINE_CONFIG $xine_config_args --plugindir 2>/dev/null`" + xine_locale_dir="`$XINE_CONFIG $xine_config_args --localedir 2>/dev/null`" _XINE_VERSION_CHECK([$min_xine_version], [$XINE_VERSION], [xine_version_ok=yes; AC_MSG_RESULT([yes, $XINE_VERSION])], [xine_version_ok=no; AC_MSG_RESULT([no, $XINE_VERSION])]) |