summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-19 15:18:22 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-12-19 15:18:22 +0000
commit1f4109d85e5a788817321f44c45fa763bce5ffed (patch)
tree76b9bdd20f1156b83163fad93e4a8a8dc56ec260 /configure
parentf97fd3eff02bd1048750f350230d9e9192ea3dfd (diff)
downloadmpv-1f4109d85e5a788817321f44c45fa763bce5ffed.tar.bz2
mpv-1f4109d85e5a788817321f44c45fa763bce5ffed.tar.xz
Experimental support for external libass.
So far probably only works with the libass from Ubuntu 9.10 git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30066 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure10
1 files changed, 9 insertions, 1 deletions
diff --git a/configure b/configure
index d6919d55f8..234ad41c58 100755
--- a/configure
+++ b/configure
@@ -280,7 +280,8 @@ Optional features:
--disable-vstream disable TiVo vstream client support [autodetect]
--disable-pthreads disable Posix threads support [autodetect]
--disable-w32threads disable Win32 threads support [autodetect]
- --disable-ass disable internal SSA/ASS subtitle support [autodetect]
+ --disable-ass-internal disable internal SSA/ASS subtitle support [autodetect]
+ --disable-ass disable SSA/ASS subtitle support [autodetect]
--enable-rpath enable runtime linker path for extra libs [disabled]
Codecs:
@@ -741,6 +742,7 @@ _vstream=auto
_pthreads=auto
_w32threads=auto
_ass=auto
+ass_internal=yes
_rpath=no
_asmalign_pot=auto
_stream_cache=yes
@@ -1248,6 +1250,8 @@ for ac_option do
--disable-w32threads) _w32threads=no ;;
--enable-ass) _ass=yes ;;
--disable-ass) _ass=no ;;
+ --enable-ass-internal) ass_internal=yes ;;
+ --disable-ass-internal) ass_internal=no ;;
--enable-rpath) _rpath=yes ;;
--disable-rpath) _rpath=no ;;
@@ -6166,6 +6170,9 @@ EOF
cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes
if test "$_ass" = no ; then
_res_comment="FreeType >= 2.1.8 needed"
+ elif test "$ass_internal" = no ; then
+ _res_comment="external"
+ extra_ldflags="$extra_ldflags -lass"
fi
fi
if test "$_ass" = yes ; then
@@ -8304,6 +8311,7 @@ LADSPA = $_ladspa
LIBA52 = $_liba52
LIBA52_INTERNAL = $_liba52_internal
LIBASS = $_ass
+LIBASS_INTERNAL = $ass_internal
LIBBS2B = $_libbs2b
LIBDCA = $_libdca
LIBDV = $_libdv