gobject-introspection r953 - in trunk: . gir

[walters svn gnome org]

Author: walters
Date: Wed Nov 19 22:42:09 2008
New Revision: 953
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=953&view=rev

Log:
Add Gio Unix bits to the Gio.gir if available

Having a separate .gir would be fairly overkill for the few components
in the Gio Unix integration, and this mirrors how we handle Gtk.

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

Modified: trunk/configure.ac
==============================================================================
--- trunk/configure.ac	(original)
+++ trunk/configure.ac	Wed Nov 19 22:42:09 2008
@@ -109,6 +109,8 @@
 
 PKG_CHECK_MODULES(GOBJECT, [gobject-2.0 gio-2.0])
 PKG_CHECK_MODULES(GTHREAD, [gthread-2.0])
+PKG_CHECK_MODULES(GIO_UNIX, [gio-unix-2.0], have_gio_unix=true, have_gio_unix=false)
+AM_CONDITIONAL(HAVE_GIO_UNIX, test x$have_gio_unix = xtrue)
 
 PKG_CHECK_MODULES(SCANNER, [gobject-2.0 gthread-2.0 gio-2.0])
 

Modified: trunk/gir/Makefile.am
==============================================================================
--- trunk/gir/Makefile.am	(original)
+++ trunk/gir/Makefile.am	Wed Nov 19 22:42:09 2008
@@ -93,6 +93,12 @@
 GIO_LIBRARY=gio-2.0
 endif
 
+if HAVE_GIO_UNIX
+GIO_UNIX_HDRS=`pkg-config --variable=includedir gio-unix-2.0`/gio-unix-2.0/gio/*.h
+else
+GIO_UNIX_HDRS=
+endif
+
 Gio-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(srcdir)/gio-2.0.c
 	$(SCANNER) \
 	    --namespace Gio --nsversion=2.0 \
@@ -108,7 +114,8 @@
             --pkg glib-2.0 \
             --pkg gobject-2.0 \
 	    $(srcdir)/gio-2.0.c \
-	    $(GLIB_INCLUDEDIR)/gio/*.h
+	    $(GLIB_INCLUDEDIR)/gio/*.h \
+	    $(GIO_UNIX_HDRS)
 BUILT_SOURCES += Gio-2.0.gir
 EXTRA_DIST += gio-2.0.c