gir-repository r163 - in trunk: . gir

[tko svn gnome org]

Author: tko
Date: Mon Oct 27 11:28:57 2008
New Revision: 163
URL: http://svn.gnome.org/viewvc/gir-repository?rev=163&view=rev

Log:
Build PangoXft conditionally

	* configure.ac (BUILD_PANGOXFT):
	* gir/Makefile.am: Build PangoXft conditionally, pango may be
	installed without it.

Modified:
   trunk/configure.ac
   trunk/gir/Makefile.am

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Oct 27 11:28:57 2008
@@ -52,6 +52,10 @@
                   have_pango=true, have_pango=false)
 AM_CONDITIONAL(BUILD_PANGO, $have_pango)
 
+PKG_CHECK_MODULES(PANGOXFT, pangoxft >= 1.16.0,
+		  have_pangoxft=true, have_pangoxft=false)
+AM_CONDITIONAL(BUILD_PANGOXFT, $have_pangoxft)
+
 dnl poppler
 PKG_CHECK_MODULES(POPPLER, poppler-glib >= 0.8,
                   have_poppler=true, have_poppler=false)

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Mon Oct 27 11:28:57 2008
@@ -132,6 +132,7 @@
             $(PANGO_INCLUDEDIR)/pango/pangocairo.h
 BUILT_GIRSOURCES += PangoCairo-1.0.gir
 
+if BUILD_PANGOXFT
 PANGOXFT_LIBDIR=`pkg-config --variable=libdir pangoxft`
 PangoXft-1.0.gir: fontconfig-2.0.gir xft-2.0.gir xlib-2.0.gir Pango-1.0.gir PangoFT2-1.0.gir $(G_IR_SCANNER)
 	$(G_IR_SCANNER) -v --namespace PangoXft --nsversion=1.0 \
@@ -168,6 +169,7 @@
             $(PANGO_INCLUDEDIR)/pango/pangox.h
 BUILT_GIRSOURCES += PangoX-1.0.gir
 endif
+endif
 
 #poppler
 if BUILD_POPPLER