# HG changeset patch # User reimar # Date 1302386949 0 # Node ID 18eb947fc34d0e4f1b780652c31b47c80b79220e # Parent 775c82e1ece9449d600fea316637cfef20b9e9e1 Do no run the ffmpeg git check/update during ./configure --help diff -r 775c82e1ece9 -r 18eb947fc34d configure --- a/configure Sat Apr 09 22:08:01 2011 +0000 +++ b/configure Sat Apr 09 22:09:09 2011 +0000 @@ -35,6 +35,7 @@ # ############################################################################# +check_ffmpeg_git() { if test -e ffmpeg/.svn ; then echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" exit 1 @@ -57,6 +58,7 @@ fi touch ffmpeg/mp_auto_pull fi +} # Prevent locale nonsense from breaking basic text processing utils export LC_ALL=C @@ -1424,6 +1426,8 @@ esac done +check_ffmpeg_git + # Atmos: moved this here, to be correct, if --prefix is specified test -z "$_bindir" && _bindir="$_prefix/bin" test -z "$_datadir" && _datadir="$_prefix/share/mplayer"