summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure2
-rw-r--r--libass/ass_mp.h2
2 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 79a3395021..c3477e9f56 100755
--- a/configure
+++ b/configure
@@ -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"
diff --git a/libass/ass_mp.h b/libass/ass_mp.h
index 74fc869c2e..2b96ddeea1 100644
--- a/libass/ass_mp.h
+++ b/libass/ass_mp.h
@@ -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>