From fef338ce19a0d1562e5f98f5c997a983a320d571 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= <marcandre.lureau@redhat.com>
Date: Wed, 21 Dec 2011 11:48:48 +0100
Subject: [PATCH spice-gtk] build: ship vala files & fix make distcheck

Disable usbredir, since it wants to install file in /.

Disable vala for distcheck for 2 reasons: not needed after dist and
binding build issue.

Ship with spice-gtk-3.0 vala bindings

https://bugs.freedesktop.org/show_bug.cgi?id=44000
---
 Makefile.am      |    9 ++++++++-
 autogen.sh       |    2 +-
 configure.ac     |    2 +-
 vapi/Makefile.am |   11 ++++++++---
 4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 9825349..f3a84be 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,14 @@ BUILT_SOURCES = $(top_srcdir)/.version
 $(top_srcdir)/.version:
 	echo $(VERSION) > $@-t && mv $@-t $@
 
-DISTCHECK_CONFIGURE_FLAGS = --enable-introspection --enable-werror --enable-gtk-doc
+DISTCHECK_CONFIGURE_FLAGS =			\
+	--enable-introspection			\
+	--disable-vala				\
+	--disable-usbredir			\
+	--enable-gtk-doc			\
+	--enable-werror				\
+	--with-gtk=3.0				\
+	$(NULL)
 
 spicy-for-windows.exe:
 	PATH=$$PATH:/usr/i686-pc-mingw32/sys-root/mingw/bin/:/usr/i686-pc-mingw32/sys-root/mingw/lib \
diff --git a/autogen.sh b/autogen.sh
index 904c00e..2724d7e 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -13,6 +13,6 @@ if test ! -e gtk/controller/controller.vala.stamp; then
 fi
 
 if [ -z "$NOCONFIGURE" ]; then
-    "$srcdir"/configure --enable-maintainer-mode $enable_vala ${1+"$@"}
+    "$srcdir"/configure --enable-maintainer-mode --enable-gtk-doc --with-gtk=3.0 $enable_vala ${1+"$@"}
 fi
 
diff --git a/configure.ac b/configure.ac
index f0db9fa..9094b5a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -405,7 +405,7 @@ AC_ARG_ENABLE([vala],
   [],
   enable_vala="no")
 
-VALA_REQUIRED=0.11.7
+VALA_REQUIRED=0.15
 if test x$enable_vala = xyes ; then
     # check for vala
     AM_PROG_VALAC([$VALA_REQUIRED])
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 4b99645..5d8b88f 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -1,14 +1,11 @@
 NULL =
 CLEANFILES =
 
-if HAVE_INTROSPECTION
-if WITH_VALA
 BUILT_VAPI =						\
 	spice-client-glib-2.0.vapi			\
 	spice-client-gtk-$(SPICE_GTK_API_VERSION).deps	\
 	spice-client-gtk-$(SPICE_GTK_API_VERSION).vapi	\
 	$(NULL)
-CLEANFILES += $(BUILT_VAPI)
 
 vapidir = $(datadir)/vala/vapi
 vapi_DATA =						\
@@ -16,6 +13,13 @@ vapi_DATA =						\
 	$(BUILT_VAPI)
 	$(NULL)
 
+EXTRA_DIST = $(vapi_DATA)
+
+if HAVE_INTROSPECTION
+if WITH_VALA
+
+CLEANFILES += $(BUILT_VAPI)
+
 spice-client-glib-2.0.vapi: $(top_builddir)/gtk/SpiceClientGLib-2.0.gir
 	$(AM_V_GEN)$(VAPIGEN)			\
 		--library spice-client-glib-2.0	\
@@ -25,6 +29,7 @@ spice-client-gtk-$(SPICE_GTK_API_VERSION).vapi: $(top_builddir)/gtk/SpiceClientG
 	$(AM_V_GEN)$(VAPIGEN)						\
 		--vapidir=$(builddir)					\
 		--girdir=$(top_builddir)/gtk				\
+		--pkg gio-2.0                                           \
 		--pkg spice-client-glib-2.0				\
 		--pkg gtk+-$(GTK_API_VERSION)				\
 		--library spice-client-gtk-$(SPICE_GTK_API_VERSION)	\
-- 
1.7.7.4