summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2008-06-24 20:44:10 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2008-06-24 20:44:10 +0000
commit2efd9ed8388de38586dc644e9d5c30d938652ff1 (patch)
tree153cfeb5ac0fa55336fd7ba1b2d8afe22ad856ee
parenta3c10b35a592f4fabb6d53138bd3910eb21cde37 (diff)
downloadpango-2efd9ed8388de38586dc644e9d5c30d938652ff1.tar.gz
Bug 540036 – Doesn't link to fontconfig
2008-06-24 Behdad Esfahbod <behdad@gnome.org> Bug 540036 – Doesn't link to fontconfig * pango/Makefile.am: Explicitly include FREETYPE_LIBS for pangoxft. svn path=/trunk/; revision=2659
-rw-r--r--ChangeLog6
-rw-r--r--pango/Makefile.am1
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 91d6fe69..9f147a7d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2008-06-24 Behdad Esfahbod <behdad@gnome.org>
+
+ Bug 540036 – Doesn't link to fontconfig
+
+ * pango/Makefile.am: Explicitly include FREETYPE_LIBS for pangoxft.
+
2008-06-23 Behdad Esfahbod <behdad@gnome.org>
Bug 380094 – Fix split matra rendering bug for Kannada language
diff --git a/pango/Makefile.am b/pango/Makefile.am
index e89b1d5b..31a92956 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -244,6 +244,7 @@ libpangoxft_1_0_la_LIBADD = \
$(GLIB_LIBS) \
$(X_LIBS) \
$(XFT_LIBS) \
+ $(FREETYPE_LIBS) \
$(libm)
libpangoxft_1_0_la_DEPENDENCIES = \
libpangoft2-$(PANGO_API_VERSION).la \