libass needs at least freetype 2.2.1

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@30244 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
greg 2010-01-08 18:56:39 +00:00
parent bb31a48a51
commit 83da389dce
1 changed files with 3 additions and 3 deletions

6
configure vendored
View File

@ -6223,8 +6223,8 @@ if test "$_ass" = auto ; then
cat > $TMPC << EOF cat > $TMPC << EOF
#include <ft2build.h> #include <ft2build.h>
#include FT_FREETYPE_H #include FT_FREETYPE_H
#if ((FREETYPE_MAJOR < 2) || (FREETYPE_MINOR < 1) || ((FREETYPE_MINOR == 1) && (FREETYPE_PATCH < 8))) #if ((FREETYPE_MAJOR < 2) || (FREETYPE_MINOR < 2) || ((FREETYPE_MINOR == 2) && (FREETYPE_PATCH < 1)))
#error "Need FreeType 2.1.8 or newer" #error "Need FreeType 2.2.1 or newer"
#endif #endif
int main(void) { return 0; } int main(void) { return 0; }
EOF EOF
@ -6232,7 +6232,7 @@ EOF
cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes cc_check $($_freetypeconfig --cflags) $($_freetypeconfig --libs) && _ass=yes
if test "$_ass" = no ; then if test "$_ass" = no ; then
ass_internal=no ass_internal=no
_res_comment="FreeType >= 2.1.8 needed" _res_comment="FreeType >= 2.2.1 needed"
elif test "$ass_internal" = no ; then elif test "$ass_internal" = no ; then
_res_comment="external" _res_comment="external"
extra_ldflags="$extra_ldflags -lass" extra_ldflags="$extra_ldflags -lass"