diff options
| author | Owen Taylor <otaylor@redhat.com> | 2005-01-09 00:12:39 +0000 |
|---|---|---|
| committer | Owen Taylor <otaylor@src.gnome.org> | 2005-01-09 00:12:39 +0000 |
| commit | cc6ac36dd3c7e5ef39b9f21ef77596a159f2100e (patch) | |
| tree | e1b8ffc1c14d449a41946d22ea5d1c6ddf9115d8 /configure.in | |
| parent | 75f4ad29adce645ddb837e662c9d71ccfbf60154 (diff) | |
| download | pango-cc6ac36dd3c7e5ef39b9f21ef77596a159f2100e.tar.gz | |
Add checks for Cairo
Sat Jan 8 16:46:37 2005 Owen Taylor <otaylor@redhat.com>
* configure.in: Add checks for Cairo
* pango/Makefile.am: Add libpangocairo.
* pango/pangocairo-font.c pango/pangocairo-fontmap.c
pango/pangocairo.h pango/pangocairo-private.h
pango/pangocairo-fcfont.c pango/pangocairo-fcfontmap.c
pango/pangocairo-fc.h: Start of a Cairo/FreeType backend.
* pango/pangofc-fontmap.[ch]: Add a "get_render_key"
virtual function to allow subclasses to specialize the
details of how caching works. Add a default implementation
that's a little more sophisticated than what was there
before.
* pango/pangoft2-private.h pangofc-font.c pangoft2.c:
Move default implementations of has_char(), get_glyph()
to the base class.
* pango/pangofc-private.h pango/pangoft2-private.h:
Move PANGO_UNITS_26_6 and friends to pango/pangofc-private.h.
* examples/renderdemo.[ch] examples/pangoft2topgm.c
examples/xftview.c: Allow passing in a custom function
to transform drawing.
* examples/Makefile.am examples/cairoview.c: Add a
Cairo/Xlib example program.
* examples/cairosimple.c: Simple Cairo example with
output to a PNG.
* pango/pango-layout.c (pango_layout_line_get_extents): Fix
bug where line ink rect was always including 0, 0.
Diffstat (limited to 'configure.in')
| -rw-r--r-- | configure.in | 25 |
1 files changed, 25 insertions, 0 deletions
diff --git a/configure.in b/configure.in index 5f283583..1c194d57 100644 --- a/configure.in +++ b/configure.in @@ -248,6 +248,30 @@ AM_CONDITIONAL(HAVE_FREETYPE, $have_freetype) AM_CONDITIONAL(HAVE_XFT, $have_xft) # +# Checks for Cairo +# +have_cairo=false +have_cairo_freetype=false + +PKG_CHECK_MODULES(CAIRO, cairo >= 0.2.0, have_cairo=true, :) + +if $have_cairo ; then + pango_save_ldflags=$LDFLAGS + LDFLAGS="$LDFLAGS $CAIRO_LIBS" + AC_CHECK_LIB(cairo, cairo_ft_font_face, have_cairo_freetype=true, :) + LDFLAGS=$pango_save_ldflags + if $have_cairo_freetype ; then + AC_DEFINE(HAVE_CAIRO_FREETYPE, 1, [Whether Cairo uses FreeType for fonts]) + else + AC_MSG_WARN([Disabling Cairo support, no known font system]) + have_cairo=false + fi +fi + +AM_CONDITIONAL(HAVE_CAIRO, $have_cairo) +AM_CONDITIONAL(HAVE_CAIRO_FREETYPE, $have_cairo_freetype) + +# # Checks for Win32 GDI # have_win32=false @@ -680,6 +704,7 @@ backends="" if $have_freetype && $have_fontconfig ; then backends="$backends FreeType"; fi if $have_x ; then backends="$backends X"; fi if $have_xft ; then backends="$backends Xft"; fi +if $have_cairo ; then backends="$backends Cairo"; fi if $have_win32 ; then backends="$backends Win32"; fi echo "configuration: |