Mercurial > mplayer.hg
changeset 33159:18eb947fc34d
Do no run the ffmpeg git check/update during ./configure --help
author | reimar |
---|---|
date | Sat, 09 Apr 2011 22:09:09 +0000 |
parents | 775c82e1ece9 |
children | d413ad875691 |
files | configure |
diffstat | 1 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- 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"