diff options
| author | Behdad Esfahbod <behdad@behdad.org> | 2008-05-28 12:01:38 -0400 |
|---|---|---|
| committer | Behdad Esfahbod <behdad@behdad.org> | 2008-05-28 12:02:16 -0400 |
| commit | f07407335503e5612dcf07cc8f44e1781367d263 (patch) | |
| tree | 85a144dd1ceebfc37f758c534dbe99b14acb2cbb /configure.in | |
| parent | d7ddde8a324c5bfd9ca00d1fbb47cd3f1730bbfb (diff) | |
[configure.in] Dont let a missing FcFini disable the freetype font backend!
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/configure.in b/configure.in index b1a65f98..b3383a56 100644 --- a/configure.in +++ b/configure.in @@ -564,12 +564,13 @@ FREETYPE_MIN_VERSION=9.7.3 CAIRO_BACKEND_ENABLE(ft, FreeType font, freetype, FT_FONT, auto, [ ft_REQUIRES="fontconfig" - PKG_CHECK_MODULES(FONTCONFIG, $ft_REQUIRES, - [_CHECK_FUNCS_WITH_FLAGS(FcFini, [$FONTCONFIG_CFLAGS], [$FONTCONFIG_LIBS],, - [AC_MSG_RESULT(no); use_ft="no (requires fontconfig)"])], + PKG_CHECK_MODULES(FONTCONFIG, $ft_REQUIRES,, [AC_MSG_RESULT(no); use_ft="no (requires fontconfig)"]) if test "x$use_ft" = "xyes"; then + + _CHECK_FUNCS_WITH_FLAGS(FcFini, [$FONTCONFIG_CFLAGS], [$FONTCONFIG_LIBS]) + PKG_CHECK_MODULES(FREETYPE, freetype2 >= $FREETYPE_MIN_VERSION, [freetype_pkgconfig=yes], [AC_MSG_RESULT(no) |