summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-02-18 17:11:39 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-02-18 17:11:39 +0000
commit41d5e17776a2c891f2d63e852fbbc8fa425ae06c (patch)
tree40c0ddf31642777a32c0237b11154aad3361e195
parentbbb71992ed94d0e60d2a9943034ebccfe30b8a22 (diff)
downloadpango-41d5e17776a2c891f2d63e852fbbc8fa425ae06c.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 * configure.in: Add xrender to pkg-config requirements for pangoxft. svn path=/trunk/; revision=2200
-rw-r--r--ChangeLog7
-rw-r--r--configure.in2
2 files changed, 8 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f61ce4d3..7541d0f1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,13 @@
Bug 409212 – Missing link flag prevents build with "-z defs" ld flags
Patch from Loïc Minier
+ * configure.in: Add xrender to pkg-config requirements for pangoxft.
+
+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>
diff --git a/configure.in b/configure.in
index 92f3653b..8214306d 100644
--- a/configure.in
+++ b/configure.in
@@ -250,7 +250,7 @@ if $have_fontconfig ; then
# Checks for Xft/XRender
#
if $have_x && $have_freetype ; then
- PKG_CHECK_MODULES(XFT, xft >= 2.0.0, have_xft=true, AC_MSG_RESULT([no]))
+ PKG_CHECK_MODULES(XFT, xft >= 2.0.0 xrender, have_xft=true, AC_MSG_RESULT([no]))
if $have_xft ; then
AC_DEFINE(HAVE_XFT, 1, [Have Xft library])
fi