Mercurial > mplayer.hg
comparison configure @ 34142:bd4f91a73fda
configure: cosmetics: fix indentation
| author | diego |
|---|---|
| date | Fri, 21 Oct 2011 15:44:55 +0000 |
| parents | bb7288560eff |
| children | 3f73c0da20c7 |
comparison
equal
deleted
inserted
replaced
| 34141:bb7288560eff | 34142:bd4f91a73fda |
|---|---|
| 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 | 37 |
| 38 if test -e ffmpeg/.svn ; then | 38 if test -e ffmpeg/.svn ; then |
| 39 echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" | 39 echo "You have an outdated FFmpeg SVN checkout in ffmpeg/, please (re)move or replace it" |
| 40 exit 1 | 40 exit 1 |
| 41 fi | 41 fi |
| 42 | 42 |
| 43 if test -e ffmpeg/mp_auto_pull ; then | 43 if test -e ffmpeg/mp_auto_pull ; then |
| 44 if ! (cd ffmpeg && git pull --rebase --ff-only) ; 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" | 45 echo "git pull failed, (re)move ffmpeg/mp_auto_pull to disable pulling" |
| 46 exit 1 | 46 exit 1 |
| 47 fi | 47 fi |
| 48 fi | 48 fi |
| 49 | 49 |
| 50 if ! test -e ffmpeg ; then | 50 if ! test -e ffmpeg ; then |
| 51 echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" | 51 echo "No FFmpeg checkout, press enter to download one with git or CTRL+C to abort" |
| 52 read tmp | 52 read tmp |
| 53 if ! git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg ; then | 53 if ! git clone --depth 1 git://git.videolan.org/ffmpeg.git ffmpeg ; then |
| 54 rm -rf ffmpeg | 54 rm -rf ffmpeg |
| 55 echo "Failed to get a FFmpeg checkout" | 55 echo "Failed to get a FFmpeg checkout" |
| 56 exit 1 | 56 exit 1 |
| 57 fi | 57 fi |
| 58 touch ffmpeg/mp_auto_pull | 58 touch ffmpeg/mp_auto_pull |
| 59 fi | 59 fi |
| 60 | 60 |
| 61 # Prevent locale nonsense from breaking basic text processing utilities | 61 # Prevent locale nonsense from breaking basic text processing utilities |
| 62 export LC_ALL=C | 62 export LC_ALL=C |
| 63 | 63 |
| 64 # Store the configure line that was used | 64 # Store the configure line that was used |
| 5971 _ass=no | 5971 _ass=no |
| 5972 cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes | 5972 cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes |
| 5973 if test "$_ass" = no ; then | 5973 if test "$_ass" = no ; then |
| 5974 res_comment="FreeType >= 2.2.1 needed" | 5974 res_comment="FreeType >= 2.2.1 needed" |
| 5975 elif test "$ass_internal" != yes ; then | 5975 elif test "$ass_internal" != yes ; then |
| 5976 cat > $TMPC << EOF | 5976 cat > $TMPC << EOF |
| 5977 #include <ass/ass.h> | 5977 #include <ass/ass.h> |
| 5978 int main(void) { | 5978 int main(void) { |
| 5979 #if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00910000 | 5979 #if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00910000 |
| 5980 #error "libass version too old" | 5980 #error "libass version too old" |
| 5981 #endif | 5981 #endif |