summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2006-10-24 19:56:39 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2006-10-24 19:56:39 +0000
commit783cbba709f5f7eaa533f0d32cfac9cc7bd1c128 (patch)
treeb35730cbb6e3dd77036168afdeb80fdcc23ad94b
parentb485de2026ebdfbf1973d6fa383e0815c96219ec (diff)
downloadpango-783cbba709f5f7eaa533f0d32cfac9cc7bd1c128.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--ChangeLog5
-rw-r--r--examples/Makefile.am5
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 3edf696f..1a51e7f0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-10-24 Behdad Esfahbod <behdad@gnome.org>
+
+ * examples/Makefile.am (cairosimple_LDADD): Do not require pangoft2
+ unconditionally.
+
2006-10-18 Behdad Esfahbod <behdad@gnome.org>
* modules/arabic/arabic-lang.c: Do not include arabic-ot.h.
diff --git a/examples/Makefile.am b/examples/Makefile.am
index 9b95e343..07b24335 100644
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -186,10 +186,13 @@ cairosimple_SOURCES = \
cairosimple.c
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
endif
#########################################################