diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2006-02-06 15:44:37 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-02-06 15:44:37 +0000 |
commit | 75235308b9d8d30e72428627f345bcbf09641e5b (patch) | |
tree | a081a50f43a21493f43afaa03f9a7a4a2af9798c /configure.in | |
parent | 522ce4d5b39e325471edf77cea9ad15ed98505af (diff) | |
download | pango-75235308b9d8d30e72428627f345bcbf09641e5b.tar.gz |
As cairo 1.2 seems to be delayed infinitely, make all cairo HEAD API thatPANGO_1_11_4
2006-02-06 Behdad Esfahbod <behdad@gnome.org>
As cairo 1.2 seems to be delayed infinitely, make all cairo HEAD
API that we use conditional, to make a release.
* configure.in: Depend on cairo 1.0.0 again. Check for
cairo_scaled_font_get_*() and cairo_scaled_font_text_extents()
availability.
* pango/pangocairo-font.c: Work around if the above functions are not
available.
Diffstat (limited to 'configure.in')
-rw-r--r-- | configure.in | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/configure.in b/configure.in index cba667cb..73e93547 100644 --- a/configure.in +++ b/configure.in @@ -295,7 +295,7 @@ have_cairo_freetype=false have_cairo_win32=false have_cairo_atsui=false -PKG_CHECK_MODULES(CAIRO, cairo >= 1.1.1, have_cairo=true, :) +PKG_CHECK_MODULES(CAIRO, cairo >= 1.0.0, have_cairo=true, :) if $have_cairo ; then pango_save_ldflags=$LDFLAGS @@ -303,6 +303,18 @@ if $have_cairo ; then INSTALLED_CAIRO_LIBS=`PKG_CONFIG_DISABLE_UNINSTALLED=yes $PKG_CONFIG --libs cairo` LDFLAGS="$LDFLAGS $INSTALLED_CAIRO_LIBS" + # A couple temporary checks, to not rely on cairo HEAD :( + have_cairo_scaled_font_getters=false + AC_CHECK_LIB(cairo, cairo_scaled_font_get_ctm, have_cairo_scaled_font_getters=true, :) + if $have_cairo_scaled_font_getters; then + AC_DEFINE(HAVE_CAIRO_SCALED_FONT_GETTERS, 1, [Whether Cairo has cairo_scaled_font_get_*()]) + fi + have_cairo_scaled_font_text_extents=false + AC_CHECK_LIB(cairo, cairo_scaled_font_text_extents, have_cairo_scaled_font_text_extents=true, :) + if $have_cairo_scaled_font_text_extents; then + AC_DEFINE(HAVE_CAIRO_SCALED_FONT_TEXT_EXTENTS, 1, [Whether Cairo has cairo_scaled_font_text_extents()]) + fi + AC_CHECK_LIB(cairo, cairo_surface_write_to_png, have_cairo_png=true, :) if $have_cairo_png; then AC_DEFINE(HAVE_CAIRO_PNG, 1, [Whether Cairo has PNG support]) |