# HG changeset patch # User reimar # Date 1261237307 0 # Node ID 868442ec038e095d7938f8d0e2c6dc79500045c9 # Parent 25ff7b3705239d916ac4daaeef56ae608fef835a Make ass_mp.h use the system-libass headers when the internal one is disabled. diff -r 25ff7b370523 -r 868442ec038e configure --- a/configure Sat Dec 19 15:32:17 2009 +0000 +++ b/configure Sat Dec 19 15:41:47 2009 +0000 @@ -6180,6 +6180,11 @@ else def_ass='#undef CONFIG_ASS' fi +if test "$ass_internal" = yes ; then + def_ass_internal='#define CONFIG_ASS_INTERNAL 1' +else + def_ass_internal='#undef CONFIG_ASS_INTERNAL' +fi echores "$_ass" @@ -8772,6 +8777,7 @@ /* font stuff */ $def_ass +$def_ass_internal $def_bitmap_font $def_enca $def_fontconfig diff -r 25ff7b370523 -r 868442ec038e libass/ass_mp.h --- a/libass/ass_mp.h Sat Dec 19 15:32:17 2009 +0000 +++ b/libass/ass_mp.h Sat Dec 19 15:41:47 2009 +0000 @@ -24,8 +24,11 @@ #define LIBASS_MP_H #include "subreader.h" -#include "ass_types.h" +#ifdef CONFIG_LIBASS_INTERNAL #include "ass.h" +#else +#include +#endif extern ass_library_t* ass_library; extern int ass_enabled;