diff options
| author | Colin Walters <walters@src.gnome.org> | 2008-11-19 22:42:09 +0000 |
|---|---|---|
| committer | Colin Walters <walters@src.gnome.org> | 2008-11-19 22:42:09 +0000 |
| commit | 676bd789f0fb9decadea6097692e75299b3cf0a9 (patch) | |
| tree | 3ff3089cd47ba44ef9d97374ba4760c81950ef10 | |
| parent | 66872264eecb5da856bd5ed7b89dd028af683aae (diff) | |
| download | gobject-introspection-676bd789f0fb9decadea6097692e75299b3cf0a9.tar.gz | |
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.
svn path=/trunk/; revision=953
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gir/Makefile.am | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 158203b9..60b78479 100644 --- a/configure.ac +++ b/configure.ac @@ -109,6 +109,8 @@ AC_DEFINE_UNQUOTED(GOBJECT_INTROSPECTION_LIBDIR,"$GOBJECT_INTROSPECTION_LIBDIR", 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]) diff --git a/gir/Makefile.am b/gir/Makefile.am index 40599acf..c795091d 100644 --- a/gir/Makefile.am +++ b/gir/Makefile.am @@ -93,6 +93,12 @@ else 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 @@ Gio-2.0.gir: GObject-2.0.gir $(SCANNER_BIN) $(SCANNER_LIBS) Makefile $(srcdir)/g --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 |