gir-repository r164 - in trunk: . gir

[tko svn gnome org]

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

Log:
Build xft/xlib conditionally

	* configure.ac (BUILD_XFT):
	* gir/Makefile.am: Build xft/xlib conditionally, they're not
	necessarily present (osx, win32)

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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Mon Oct 27 11:29:01 2008
@@ -42,6 +42,11 @@
 m4_define(pycairo_required_version,    1.0.2) dnl or 1.1.7
 m4_define(pygobject_required_version,  2.14.0)
 
+dnl xft/xlib
+PKG_CHECK_MODULES(XFT, xft,
+		  have_xft=true, have_xft=false)
+AM_CONDITIONAL(BUILD_XFT, $have_xft)
+
 dnl atk
 PKG_CHECK_MODULES(ATK, atk >= 1.12.0,
                   have_atk=true, have_atk=false)

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Mon Oct 27 11:29:01 2008
@@ -9,8 +9,6 @@
 	fontconfig-2.0.gir	\
 	freetype2-2.0.gir	\
 	libxml2-2.0.gir	\
-	xft-2.0.gir		\
-	xlib-2.0.gir	\
 	GL-1.0.gir
 BUILT_GIRSOURCES =
 
@@ -26,6 +24,10 @@
 	LibTelepathy.gir
 endif
 
+if BUILD_XFT
+CUSTOM_GIRSOURCES += xft-2.0.gir xlib-2.0.gir
+endif
+
 if BUILD_GCONF
 GCONF_INCLUDEDIR=`pkg-config --variable=includedir gconf-2.0`/gconf/2
 GCONF_LIBDIR=`pkg-config --variable=libdir gconf-2.0`