diff options
author | Khaled Hosny <khaledhosny@eglug.org> | 2013-05-11 07:46:15 +0200 |
---|---|---|
committer | Khaled Hosny <khaledhosny@eglug.org> | 2013-05-11 08:55:40 +0200 |
commit | 1266602a0d47c348043c301677399a24eeeebcce (patch) | |
tree | 7e65117a22cc169e820850028327afface1e61ea /configure.ac | |
parent | f9560c8f9982eaef09b74baa479c187f049c4f9e (diff) |
Fix FreeType version check
FreeType has 3 different kinds of versions
* release, like 2.4.10
* libtool, like 13.0.7 (this what pkg-config returns)
* soname
FreeType's docs/VERSION.DLL provides a table mapping between the three
We were checking for >= 2.0 which is always true of course, so I
replaced it with 9.4.3 i.e. 2.1.5; the first FreeType release to provide
a freetype2.pc file (I could have omitted the version check at all,
since it is practically the same), but this should be replaced with a
real minimum required version.
Change-Id: I95f6c398a5b19d4bb728a6dddc957a9f95f27efa
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 9871f4ca573a..5aba388469a8 100644 --- a/configure.ac +++ b/configure.ac @@ -7279,7 +7279,15 @@ dnl Check whether freetype is available dnl =================================================================== if test "$test_freetype" = "yes"; then AC_MSG_CHECKING([whether freetype is available]) - PKG_CHECK_MODULES( FREETYPE, freetype2 >= 2.0 ) + # FreeType has 3 different kinds of versions + # * release, like 2.4.10 + # * libtool, like 13.0.7 (this what pkg-config returns) + # * soname + # FreeType's docs/VERSION.DLL provides a table mapping between the three + # + # 9.4.3 is 2.1.5; the first FreeType release to provide a freetype2.pc file + # XXX: replace this with a real minimum required version + PKG_CHECK_MODULES( FREETYPE, freetype2 >= 9.4.3 ) else case "$BUILD_TYPE" in *FREETYPE*) |