diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-25 07:24:39 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-26 20:22:43 +0300 |
commit | 546c3fb53ce64fde5cba3e06012d244e73ae497a (patch) | |
tree | 8708989ac0b06edc091a71d73508ffc465fd669e /configure | |
parent | 6fbcf16cfb0c6482bef87a0e8ac2162bca4cdbfd (diff) | |
download | mpv-546c3fb53ce64fde5cba3e06012d244e73ae497a.tar.bz2 mpv-546c3fb53ce64fde5cba3e06012d244e73ae497a.tar.xz |
Remove internal libass tree
Remove the libass/ directory and use the newest standalone version of
the library instead.
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 33 |
1 files changed, 10 insertions, 23 deletions
@@ -6092,29 +6092,16 @@ echores "$_fontconfig" echocheck "SSA/ASS support" -# libass depends on FreeType -if test "$_freetype" = no ; then - _ass=no - _res_comment="FreeType support needed" -fi - -if test "$_ass" = auto ; then - cat > $TMPC << EOF -#include <ft2build.h> -#include FT_FREETYPE_H -#if ((FREETYPE_MAJOR < 2) || (FREETYPE_MINOR < 1) || ((FREETYPE_MINOR == 1) && (FREETYPE_PATCH < 8))) -#error "Need FreeType 2.1.8 or newer" -#endif -int main(void) { return 0; } -EOF - _ass=no - cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && tmp_run && _ass=yes - if test "$_ass" = no ; then - _res_comment="FreeType >= 2.1.8 needed" - fi -fi -if test "$_ass" = yes ; then - def_ass='#define CONFIG_ASS' +if test "$_ass" = auto -o "$_ass" = yes ; then + if $_pkg_config libass; then + _ass=yes + def_ass='#define CONFIG_ASS' + extra_ldflags="$extra_ldflags $($_pkg_config --libs libass)" + extra_cflags="$extra_cflags $($_pkg_config --cflags libass)" + else + _ass=no + def_ass='#undef CONFIG_ASS' + fi else def_ass='#undef CONFIG_ASS' fi |