Mercurial > mplayer.hg
comparison configure @ 31939:6ccc2a358030
Fix --disable-ass-internal to actually have an effect.
Further cleanup of this "mess" welcome.
| author | reimar |
|---|---|
| date | Thu, 26 Aug 2010 19:24:18 +0000 |
| parents | 275c14fdfd80 |
| children | 339f812bb844 |
comparison
equal
deleted
inserted
replaced
| 31938:93c67b51b171 | 31939:6ccc2a358030 |
|---|---|
| 803 _musepack=auto | 803 _musepack=auto |
| 804 _vstream=auto | 804 _vstream=auto |
| 805 _pthreads=auto | 805 _pthreads=auto |
| 806 _w32threads=auto | 806 _w32threads=auto |
| 807 _ass=auto | 807 _ass=auto |
| 808 ass_internal=no | 808 ass_internal=auto |
| 809 _rpath=no | 809 _rpath=no |
| 810 _asmalign_pot=auto | 810 _asmalign_pot=auto |
| 811 _stream_cache=yes | 811 _stream_cache=yes |
| 812 _priority=no | 812 _priority=no |
| 813 def_dos_paths="#define HAVE_DOS_PATHS 0" | 813 def_dos_paths="#define HAVE_DOS_PATHS 0" |
| 6409 int main(void) { return 0; } | 6409 int main(void) { return 0; } |
| 6410 EOF | 6410 EOF |
| 6411 _ass=no | 6411 _ass=no |
| 6412 cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes | 6412 cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes |
| 6413 if test "$_ass" = no ; then | 6413 if test "$_ass" = no ; then |
| 6414 ass_internal=no | |
| 6415 res_comment="FreeType >= 2.2.1 needed" | 6414 res_comment="FreeType >= 2.2.1 needed" |
| 6416 elif test "$ass_internal" = no ; then | 6415 elif test "$ass_internal" != yes ; then |
| 6417 cat > $TMPC << EOF | 6416 cat > $TMPC << EOF |
| 6418 #include <ass/ass.h> | 6417 #include <ass/ass.h> |
| 6419 int main(void) { | 6418 int main(void) { |
| 6420 #if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00910000 | 6419 #if !defined(LIBASS_VERSION) || LIBASS_VERSION < 0x00910000 |
| 6421 #error "libass version too old" | 6420 #error "libass version too old" |
| 6425 } | 6424 } |
| 6426 EOF | 6425 EOF |
| 6427 if cc_check -lass ; then | 6426 if cc_check -lass ; then |
| 6428 res_comment="external" | 6427 res_comment="external" |
| 6429 extra_ldflags="$extra_ldflags -lass" | 6428 extra_ldflags="$extra_ldflags -lass" |
| 6429 elif test "$ass_internal" = auto ; then | |
| 6430 ass_internal=yes | |
| 6430 else | 6431 else |
| 6431 ass_internal=yes | 6432 _ass=no |
| 6432 fi | 6433 fi |
| 6433 fi | 6434 fi |
| 6434 fi | 6435 fi |
| 6435 if test "$_ass" = yes ; then | 6436 if test "$_ass" = yes ; then |
| 6436 def_ass='#define CONFIG_ASS 1' | 6437 def_ass='#define CONFIG_ASS 1' |
| 6439 fi | 6440 fi |
| 6440 if test "$ass_internal" = yes ; then | 6441 if test "$ass_internal" = yes ; then |
| 6441 def_ass_internal='#define CONFIG_ASS_INTERNAL 1' | 6442 def_ass_internal='#define CONFIG_ASS_INTERNAL 1' |
| 6442 else | 6443 else |
| 6443 def_ass_internal='#undef CONFIG_ASS_INTERNAL' | 6444 def_ass_internal='#undef CONFIG_ASS_INTERNAL' |
| 6445 ass_internal=no | |
| 6444 fi | 6446 fi |
| 6445 echores "$_ass" | 6447 echores "$_ass" |
| 6446 | 6448 |
| 6447 | 6449 |
| 6448 echocheck "fribidi with charsets" | 6450 echocheck "fribidi with charsets" |