Merge lp:~ted/libdbusmenu/introspection-0.10-check into lp:~ken-vandine/libdbusmenu/natty-gtk3-fixes

[Ted Gould]

Checking for GIR < 0.10

[Ken VanDine (ken-vandine)]

Looks good, works on natty

review: Approve

=== modified file 'configure.ac'
--- configure.ac	2010-11-11 17:23:00 +0000
+++ configure.ac	2010-12-06 16:54:18 +0000
@@ -116,6 +116,12 @@
 
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
+PKG_CHECK_EXISTS([gobject-introspection-1.0 >= 0.10],
+				 introspection_ten=yes,
+				 introspection_ten=no)
+
+AM_CONDITIONAL(INTROSPECTION_TEN, [test "x$introspection_ten" = "xyes"])
+
 ###########################
 # Vala API Generation
 ###########################
 
=== modified file 'libdbusmenu-glib/Makefile.am'
--- libdbusmenu-glib/Makefile.am	2010-11-23 21:06:30 +0000
+++ libdbusmenu-glib/Makefile.am	2010-12-06 16:54:18 +0000
@@ -114,11 +114,18 @@
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = 
+
+if INTROSPECTION_TEN
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
         --add-include-path=$(srcdir) \
         $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources)) \
         --symbol-prefix=dbusmenu \
         --identifier-prefix=Dbusmenu
+else
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+        --add-include-path=$(srcdir) \
+        $(addprefix --c-include=libdbusmenu-glib/, $(introspection_sources))
+endif
 
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir)
 
 
=== modified file 'libdbusmenu-gtk/Makefile.am'
--- libdbusmenu-gtk/Makefile.am	2010-11-23 21:06:30 +0000
+++ libdbusmenu-gtk/Makefile.am	2010-12-06 16:54:18 +0000
@@ -66,11 +66,19 @@
 
 -include $(INTROSPECTION_MAKEFILE)
 INTROSPECTION_GIRS = 
+
+if INTROSPECTION_TEN
 INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
 	--add-include-path=$(top_builddir)/libdbusmenu-glib \
 	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources)) \
 	--symbol-prefix=dbusmenu \
 	--identifier-prefix=DbusmenuGtk
+else
+INTROSPECTION_SCANNER_ARGS = --add-include-path=$(srcdir) \
+	--add-include-path=$(top_builddir)/libdbusmenu-glib \
+	$(addprefix --c-include=libdbusmenu-gtk/, $(introspection_sources))
+endif
+
 INTROSPECTION_COMPILER_ARGS = --includedir=$(builddir) --includedir=$(top_builddir)/libdbusmenu-glib
 
 if HAVE_INTROSPECTION