summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-02-18 17:09:21 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-02-18 17:09:21 +0000
commitbbb71992ed94d0e60d2a9943034ebccfe30b8a22 (patch)
tree683f678cda35503dbd34ab977d8dbba7c4e92a29
parent45fdd2691c9d1832cc2d56e79f7f7bc07b8b74da (diff)
downloadpango-bbb71992ed94d0e60d2a9943034ebccfe30b8a22.tar.gz
Bug 409212 – Missing link flag prevents build with "-z defs" ld flags
2007-02-18 Behdad Esfahbod <behdad@gnome.org> Bug 409212 – Missing link flag prevents build with "-z defs" ld flags Patch from Loïc Minier * pango/Makefile.am: Add $(X_LIBS) to pangoxft_LDADD. svn path=/trunk/; revision=2199
-rw-r--r--ChangeLog7
-rw-r--r--pango/Makefile.am1
2 files changed, 8 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 7a3d08d1..f61ce4d3 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-02-18 Behdad Esfahbod <behdad@gnome.org>
+
+ Bug 409212 – Missing link flag prevents build with "-z defs" ld flags
+ Patch from Loïc Minier
+
+ * pango/Makefile.am: Add $(X_LIBS) to pangoxft_LDADD.
+
2007-02-16 Behdad Esfahbod <behdad@gnome.org>
Bug 355987 – choosing font/shaper for spaces breaks Arabic runs on
diff --git a/pango/Makefile.am b/pango/Makefile.am
index 07c9a1c2..be363b05 100644
--- a/pango/Makefile.am
+++ b/pango/Makefile.am
@@ -239,6 +239,7 @@ libpangoxft_1_0_la_LIBADD = \
libpangoft2-$(PANGO_API_VERSION).la \
libpango-$(PANGO_API_VERSION).la \
$(GLIB_LIBS) \
+ $(X_LIBS) \
$(XFT_LIBS) \
$(libm)
libpangoxft_1_0_la_DEPENDENCIES = \