Mercurial > mplayer.hg

changeset 31939:6ccc2a358030

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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 93c67b51b171
children f1e3d7471ac8
files configure
diffstat 1 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Thu Aug 26 18:44:14 2010 +0000
+++ b/configure	Thu Aug 26 19:24:18 2010 +0000
@@ -805,7 +805,7 @@
 _pthreads=auto
 _w32threads=auto
 _ass=auto
-ass_internal=no
+ass_internal=auto
 _rpath=no
 _asmalign_pot=auto
 _stream_cache=yes
@@ -6411,9 +6411,8 @@
     _ass=no
     cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes
     if test "$_ass" = no ; then
-        ass_internal=no
         res_comment="FreeType >= 2.2.1 needed"
-    elif test "$ass_internal" = no ; then
+    elif test "$ass_internal" != yes ; then
     cat > $TMPC << EOF
 #include <ass/ass.h>
 int main(void) {
@@ -6427,8 +6426,10 @@
         if cc_check -lass ; then
             res_comment="external"
             extra_ldflags="$extra_ldflags -lass"
+        elif test "$ass_internal" = auto ; then
+            ass_internal=yes
         else
-            ass_internal=yes
+            _ass=no
         fi
     fi
 fi
@@ -6441,6 +6442,7 @@
     def_ass_internal='#define CONFIG_ASS_INTERNAL 1'
 else
     def_ass_internal='#undef CONFIG_ASS_INTERNAL'
+    ass_internal=no
 fi
 echores "$_ass"