[MPlayer-cvslog] r32020 - trunk/configure

[reimar]

Author: reimar
Date: Thu Aug 26 21:24:18 2010
New Revision: 32020

Log:
Fix --disable-ass-internal to actually have an effect.
Further cleanup of this "mess" welcome.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Thu Aug 26 20:44:14 2010	(r32019)
+++ trunk/configure	Thu Aug 26 21:24:18 2010	(r32020)
@@ -805,7 +805,7 @@ _vstream=auto
 _pthreads=auto
 _w32threads=auto
 _ass=auto
-ass_internal=no
+ass_internal=auto
 _rpath=no
 _asmalign_pot=auto
 _stream_cache=yes
@@ -6411,9 +6411,8 @@ EOF
     _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 @@ EOF
         if cc_check -lass ; then
             res_comment="external"
             extra_ldflags="$extra_ldflags -lass"
-        else
+        elif test "$ass_internal" = auto ; then
             ass_internal=yes
+        else
+            _ass=no
         fi
     fi
 fi
@@ -6441,6 +6442,7 @@ if test "$ass_internal" = yes ; then
     def_ass_internal='#define CONFIG_ASS_INTERNAL 1'
 else
     def_ass_internal='#undef CONFIG_ASS_INTERNAL'
+    ass_internal=no
 fi
 echores "$_ass"