From: Behdad Esfahbod Date: Fri, 20 Jul 2007 23:43:49 +0000 (+0000) Subject: Bug 449482 – Build error when xft not present X-Git-Tag: PANGO_1_16_5~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f7ec37b8f9e4546cf71d8bb38c88a96f67c19408;p=platform%2Fupstream%2Fpango.git Bug 449482 – Build error when xft not present 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 --- diff --git a/ChangeLog b/ChangeLog index 36bf35e..9b91a24 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 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: * modules/basic/basic-fc.c: * modules/hebrew/hebrew-fc.c: diff --git a/docs/Makefile.am b/docs/Makefile.am index 2b3cc0a..0897810 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