diff options
author | Behdad Esfahbod <behdad@gnome.org> | 2006-10-24 19:54:26 +0000 |
---|---|---|
committer | Behdad Esfahbod <behdad@src.gnome.org> | 2006-10-24 19:54:26 +0000 |
commit | 244270f1f65375b7f95b142ad8ed863a3d7f2062 (patch) | |
tree | a5b837b2b875e6dd549b91e8be003117b557b23a | |
parent | 2fa4a1391242c7918ba004ee9622410224aaaaba (diff) | |
download | pango-244270f1f65375b7f95b142ad8ed863a3d7f2062.tar.gz |
Do not require pangoft2 unconditionally.
2006-10-24 Behdad Esfahbod <behdad@gnome.org>
* examples/Makefile.am (cairosimple_LDADD): Do not require pangoft2
unconditionally.
-rw-r--r-- | ChangeLog | 5 | ||||
-rw-r--r-- | examples/Makefile.am | 5 |
2 files changed, 9 insertions, 1 deletions
@@ -1,5 +1,10 @@ 2006-10-24 Behdad Esfahbod <behdad@gnome.org> + * examples/Makefile.am (cairosimple_LDADD): Do not require pangoft2 + unconditionally. + +2006-10-24 Behdad Esfahbod <behdad@gnome.org> + * pango/pangoft2-fontmap.c (pango_ft2_font_map_class_init), (pango_ft2_font_map_get_resolution): Implement get_resolution for FT2 fontmaps. diff --git a/examples/Makefile.am b/examples/Makefile.am index 82fd6604..8c2bcb79 100644 --- a/examples/Makefile.am +++ b/examples/Makefile.am @@ -187,10 +187,13 @@ noinst_PROGRAMS += cairosimple cairotwisted cairosimple_LDADD = \ ../pango/libpango-$(PANGO_API_VERSION).la \ - ../pango/libpangoft2-$(PANGO_API_VERSION).la \ ../pango/libpangocairo-$(PANGO_API_VERSION).la \ $(GLIB_LIBS) \ $(CAIRO_LIBS) +if HAVE_FREETYPE +cairosimple_LDADD += \ + ../pango/libpangoft2-$(PANGO_API_VERSION).la +endif cairotwisted_LDADD = $(cairosimple_LDADD) endif ######################################################### |