summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBehdad Esfahbod <behdad@gnome.org>2007-07-20 23:43:49 +0000
committerBehdad Esfahbod <behdad@src.gnome.org>2007-07-20 23:43:49 +0000
commitf7ec37b8f9e4546cf71d8bb38c88a96f67c19408 (patch)
tree6a8d0a0fbdec68dfe00eb5184961468b0f0d26e4
parentf3cbe5748e62b730eb4eca41bef3a5d81261aacd (diff)
downloadpango-f7ec37b8f9e4546cf71d8bb38c88a96f67c19408.tar.gz
Bug 449482 – Build error when xft not present
2007-07-21 Behdad Esfahbod <behdad@gnome.org> Bug 449482 – Build error when xft not present * docs/Makefile.am: Make docs build without xft. svn path=/trunk/; revision=2373
-rw-r--r--ChangeLog6
-rw-r--r--docs/Makefile.am8
2 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 36bf35e7..9b91a248 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-07-21 Behdad Esfahbod <behdad@gnome.org>
+ Bug 449482 – Build error when xft not present
+
+ * docs/Makefile.am: Make docs build without xft.
+
+2007-07-21 Behdad Esfahbod <behdad@gnome.org>
+
* modules/arabic/arabic-fc.c:
* modules/basic/basic-fc.c:
* modules/hebrew/hebrew-fc.c:
diff --git a/docs/Makefile.am b/docs/Makefile.am
index 2b3cc0a2..08978104 100644
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -53,12 +53,16 @@ INCLUDES = \
$(FREETYPE_CFLAGS) \
$(X_CFLAGS)
-# libpangoxft.la pulls in libpango.la and libpangoft2.la;
+# libpangoxft.la and/or libpangocairo.la pull in libpango.la
+# and libpangoft2.la;
# We're assuming here that we'll only regenerate the
# HTML docs on Unix. We don't get introspection on Win32
-# specific types, but that isn't a bug deal.
+# specific types, but that isn't a big deal.
+
+if HAVE_XFT
GTKDOC_LIBS = \
$(top_builddir)/pango/libpangoxft-1.0.la
+endif
if HAVE_CAIRO
GTKDOC_LIBS += $(top_builddir)/pango/libpangocairo-1.0.la