gir-repository r234 - in trunk: . gir

[johan svn gnome org]

Author: johan
Date: Tue Nov 25 21:15:28 2008
New Revision: 234
URL: http://svn.gnome.org/viewvc/gir-repository?rev=234&view=rev

Log:
2008-11-25  Johan Dahlin  <jdahlin async com br>

        Bug 562030 â gir repository fails to build DBus-1.0.typelib 
        without dbus-glib installed

        * configure.ac:
        * gir/Makefile.am:
        Patch by Tom Parker.



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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Tue Nov 25 21:15:28 2008
@@ -36,6 +36,11 @@
 m4_define(pycairo_required_version,    1.0.2) dnl or 1.1.7
 m4_define(pygobject_required_version,  2.14.0)
 
+dnl dbus
+PKG_CHECK_MODULES(DBUS, dbus-glib,
+		  have_dbus=true, have_dbus=false)
+AM_CONDITIONAL(BUILD_DBUS, $have_dbus)
+
 dnl xft/xlib
 PKG_CHECK_MODULES(XFT, xft,
 		  have_xft=true, have_xft=false)

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Tue Nov 25 21:15:28 2008
@@ -5,7 +5,6 @@
 
 CUSTOM_GIRSOURCES = 	\
 	cairo-1.0.gir 	\
-	DBus-1.0.gir	\
 	fontconfig-2.0.gir	\
 	freetype2-2.0.gir	\
 	libxml2-2.0.gir
@@ -13,6 +12,10 @@
 
 XPATH_TESTS =
 
+if BUILD_DBUS
+CUSTOM_GIRSOURCES += DBus-1.0.gir
+endif
+
 if BUILD_AVAHI
 CUSTOM_GIRSOURCES += AvahiCore-0.6.gir
 endif