[MPlayer-cvslog] r30166 - in trunk: configure libass/ass_mp.h

[reimar]

Author: reimar
Date: Fri Jan  1 19:51:59 2010
New Revision: 30166

Log:
Fix compilation if FreeType is not available, in particular do not try to build
libass and use the internal ass.h as a stub for structs needed for EOSD.

Modified:
   trunk/configure
   trunk/libass/ass_mp.h

Modified: trunk/configure
==============================================================================
--- trunk/configure	Fri Jan  1 14:23:16 2010	(r30165)
+++ trunk/configure	Fri Jan  1 19:51:59 2010	(r30166)
@@ -6154,6 +6154,7 @@ echocheck "SSA/ASS support"
 # libass depends on FreeType
 if test "$_freetype" = no ; then
     _ass=no
+    ass_internal=no
     _res_comment="FreeType support needed"
 fi
 
@@ -6169,6 +6170,7 @@ EOF
     _ass=no
     cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes
     if test "$_ass" = no ; then
+        ass_internal=no
         _res_comment="FreeType >= 2.1.8 needed"
     elif test "$ass_internal" = no ; then
         _res_comment="external"

Modified: trunk/libass/ass_mp.h
==============================================================================
--- trunk/libass/ass_mp.h	Fri Jan  1 14:23:16 2010	(r30165)
+++ trunk/libass/ass_mp.h	Fri Jan  1 19:51:59 2010	(r30166)
@@ -24,7 +24,7 @@
 #define LIBASS_MP_H
 
 #include "subreader.h"
-#ifdef CONFIG_ASS_INTERNAL
+#if defined(CONFIG_ASS_INTERNAL) || !defined(CONFIG_ASS)
 #include "ass.h"
 #else
 #include <ass/ass.h>