From f7ec37b8f9e4546cf71d8bb38c88a96f67c19408 Mon Sep 17 00:00:00 2001 From: Behdad Esfahbod Date: Fri, 20 Jul 2007 23:43:49 +0000 Subject: =?UTF-8?q?Bug=20449482=20=E2=80=93=20Build=20error=20when=20xft?= =?UTF-8?q?=20not=20present?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 2007-07-21 Behdad Esfahbod Bug 449482 – Build error when xft not present * docs/Makefile.am: Make docs build without xft. svn path=/trunk/; revision=2373 --- ChangeLog | 6 ++++++ docs/Makefile.am | 8 ++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 36bf35e7..9b91a248 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-07-21 Behdad Esfahbod + + Bug 449482 – Build error when xft not present + + * docs/Makefile.am: Make docs build without xft. + 2007-07-21 Behdad Esfahbod * modules/arabic/arabic-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 -- cgit v1.2.1