diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-14 15:06:02 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-14 15:06:02 +0000 |
| commit | 841473467fd19e4fa4e255d9e17af526ecee5ac8 (patch) | |
| tree | 69cddfd789029bd952cef2c3961da210074dfaba | |
| parent | b243c8ddeb10a19f65ac46a07f8ae2a414fa3e8d (diff) | |
| download | xine-lib-841473467fd19e4fa4e255d9e17af526ecee5ac8.tar.gz xine-lib-841473467fd19e4fa4e255d9e17af526ecee5ac8.tar.bz2 | |
Silence use of xine-config when invoked from AM_PATH_XINE.
| -rw-r--r-- | m4/xine.m4 | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/m4/xine.m4 b/m4/xine.m4 index 6c8d980b6..a92fb54e9 100644 --- a/m4/xine.m4 +++ b/m4/xine.m4 @@ -65,19 +65,20 @@ AC_ARG_ENABLE(xinetest, if test "$XINE_CONFIG" = "no" ; then no_xine=yes else - XINE_CFLAGS=`$XINE_CONFIG $xine_config_args --cflags` - XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs` - XINE_ACFLAGS=`$XINE_CONFIG $xine_config_args --acflags` - xine_config_major_version=`$XINE_CONFIG $xine_config_args --version | \ + XINE_CFLAGS=`$XINE_CONFIG $xine_config_args --cflags 2>/dev/null` + XINE_LIBS=`$XINE_CONFIG $xine_config_args --libs 2>/dev/null` + XINE_ACFLAGS=`$XINE_CONFIG $xine_config_args --acflags 2>/dev/null` + xine_version=`$XINE_CONFIG $xine_config_args --version 2>/dev/null` + xine_config_major_version=`echo "$xine_version" | \ sed -n 's/^\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\1/p'` - xine_config_minor_version=`$XINE_CONFIG $xine_config_args --version | \ + xine_config_minor_version=`echo "$xine_version" | \ sed -n 's/^\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\2/p'` - xine_config_sub_version=`$XINE_CONFIG $xine_config_args --version | \ + xine_config_sub_version=`echo "$xine_version" | \ sed -n 's/^\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*$/\3/p'` - 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_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` dnl if test "x$enable_xinetest" = "xyes" ; then ac_save_CFLAGS="$CFLAGS" ac_save_LIBS="$LIBS" |