# HG changeset patch # User reimar # Date 1302391251 0 # Node ID d413ad8756911c0f43e7a9b5d91b7eff91fc1f9e # Parent 18eb947fc34d0e4f1b780652c31b47c80b79220e Reindent. Probably should also be moved, but that I leave to someone else. diff -r 18eb947fc34d -r d413ad875691 configure --- a/configure Sat Apr 09 22:09:09 2011 +0000 +++ b/configure Sat Apr 09 23:20:51 2011 +0000 @@ -36,28 +36,28 @@ ############################################################################# 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 -fi - -if test -e ffmpeg/mp_auto_pull ; then - if ! (cd ffmpeg && git pull --rebase --ff-only) ; then - echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" + if test -e ffmpeg/.svn ; then + echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" exit 1 fi -fi - -if ! test -e ffmpeg ; then - echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" - read tmp - if ! git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg ; then - rm -rf ffmpeg - echo "Failed to get a FFmpeg checkout" - exit 1 - fi - touch ffmpeg/mp_auto_pull -fi + + if test -e ffmpeg/mp_auto_pull ; then + if ! (cd ffmpeg && git pull --rebase --ff-only) ; then + echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" + exit 1 + fi + fi + + if ! test -e ffmpeg ; then + echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" + read tmp + if ! git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg ; then + rm -rf ffmpeg + echo "Failed to get a FFmpeg checkout" + exit 1 + fi + touch ffmpeg/mp_auto_pull + fi } # Prevent locale nonsense from breaking basic text processing utils