--- configure.ac.orig	2011-02-05 15:01:31.212827464 +0100
+++ configure.ac	2011-02-05 15:13:08.310031260 +0100
@@ -143,7 +143,17 @@
 # Vala API Generation
 ###########################
 
+AC_ARG_ENABLE([vala],
+	AC_HELP_STRING([--disable-vala], [Disable vala]),
+	[enable_vala=$enableval], [enable_vala=auto])
+
+AS_IF([test "x$enable_vala" != "xno"],[
+	AM_COND_IF([HAVE_INTROSPECTION],,[
+		AC_MSG_ERROR([Vala bindings require introspection support, please --enable-introspection])
+	])
 AC_PATH_PROG([VALA_API_GEN], [vapigen])
+])
+AM_CONDITIONAL([HAVE_VALA], [test -n "$VALA_API_GEN"])
 
 ###########################
 # XSLT Processor
@@ -193,1 +193,6 @@
 
+AM_COND_IF([HAVE_VALA],
+	AC_MSG_NOTICE([	Vala bindings:          yes]),
+	AC_MSG_NOTICE([	Vala bindings           no])
+)
+
--- libdbusmenu-gtk/Makefile.am.orig	2011-02-05 15:09:06.429965757 +0100
+++ libdbusmenu-gtk/Makefile.am	2011-02-05 15:08:14.742722310 +0100
@@ -131,6 +131,7 @@
 # VAPI Files
 #########################
 
+if HAVE_VALA
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
@@ -154,4 +155,5 @@
 CLEANFILES += $(vapi_DATA) DbusmenuGtk$(VER)-0.4.tmp.gir
 
 endif
+endif
 
--- libdbusmenu-glib/Makefile.am.orig	2011-02-05 15:08:49.613538681 +0100
+++ libdbusmenu-glib/Makefile.am	2011-02-05 15:06:23.826443241 +0100
@@ -165,6 +165,7 @@
 # VAPI Files
 #########################
 
+if HAVE_VALA
 if HAVE_INTROSPECTION
 
 vapidir = $(datadir)/vala/vapi
@@ -176,4 +177,5 @@
 CLEANFILES += $(vapi_DATA)
 
 endif
+endif