comparison configure @ 33165:0c17a7d0f6ef

Revert r33246: It broke building MPlayer immediately after adding new formats or codecs to FFmpeg.
author cehoyos
date Tue, 12 Apr 2011 08:03:41 +0000
parents dc853608cda3
children eb7c55923711
comparison
equal deleted inserted replaced
33164:dc853608cda3 33165:0c17a7d0f6ef
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 check_ffmpeg_git() {
39 if test -e ffmpeg/.svn ; then 38 if test -e ffmpeg/.svn ; then
40 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"
41 exit 1 40 exit 1
42 fi 41 fi
43 42
56 echo "Failed to get a FFmpeg checkout" 55 echo "Failed to get a FFmpeg checkout"
57 exit 1 56 exit 1
58 fi 57 fi
59 touch ffmpeg/mp_auto_pull 58 touch ffmpeg/mp_auto_pull
60 fi 59 fi
61 }
62 60
63 # Prevent locale nonsense from breaking basic text processing utils 61 # Prevent locale nonsense from breaking basic text processing utils
64 export LC_ALL=C 62 export LC_ALL=C
65 63
66 # Store the configure line that was used 64 # Store the configure line that was used
1424 ;; 1422 ;;
1425 1423
1426 esac 1424 esac
1427 done 1425 done
1428 1426
1429 check_ffmpeg_git
1430
1431 # Atmos: moved this here, to be correct, if --prefix is specified 1427 # Atmos: moved this here, to be correct, if --prefix is specified
1432 test -z "$_bindir" && _bindir="$_prefix/bin" 1428 test -z "$_bindir" && _bindir="$_prefix/bin"
1433 test -z "$_datadir" && _datadir="$_prefix/share/mplayer" 1429 test -z "$_datadir" && _datadir="$_prefix/share/mplayer"
1434 test -z "$_mandir" && _mandir="$_prefix/share/man" 1430 test -z "$_mandir" && _mandir="$_prefix/share/man"
1435 test -z "$_confdir" && _confdir="$_prefix/etc/mplayer" 1431 test -z "$_confdir" && _confdir="$_prefix/etc/mplayer"