comparison configure @ 32743:9b590f58634c

Remove outdated FFmpeg svn external, make configure optionally get and update a git checkout.
author reimar
date Sun, 30 Jan 2011 10:27:31 +0000
parents 53e29c645d4e
children b3782b0b1d92
comparison
equal deleted inserted replaced
32742:0dfeffc40c65 32743:9b590f58634c
32 # _feature : should have a value of yes/no/auto 32 # _feature : should have a value of yes/no/auto
33 # def_feature : '#define ... 1' or '#undef ...' for conditional compilation 33 # def_feature : '#define ... 1' or '#undef ...' for conditional compilation
34 # _ld_feature : '-L/path/dir -lfeature' GCC options 34 # _ld_feature : '-L/path/dir -lfeature' GCC options
35 # 35 #
36 ############################################################################# 36 #############################################################################
37
38 if test -e ffmpeg/.svn ; then
39 echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it"
40 exit 1
41 fi
42
43 if test -e ffmpeg/mp_auto_pull ; then
44 if ! (cd ffmpeg && git pull --rebase --ff-only) ; then
45 echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling"
46 exit 1
47 fi
48 fi
49
50 if ! test -e ffmpeg ; then
51 echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort"
52 read tmp
53 if ! git clone git://git.videolan.org/ffmpeg.git ffmpeg ; then
54 rm -rf ffmpeg
55 echo "Failed to get a FFmpeg checkout"
56 exit 1
57 fi
58 touch ffmpeg/mp_auto_pull
59 fi
37 60
38 # Prevent locale nonsense from breaking basic text processing utils 61 # Prevent locale nonsense from breaking basic text processing utils
39 export LC_ALL=C 62 export LC_ALL=C
40 63
41 # Store the configure line that was used 64 # Store the configure line that was used