diff options
| -rw-r--r-- | Makefile.am | 9 | ||||
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | vapi/Makefile.am | 10 |
4 files changed, 17 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 \ @@ -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 771d5a5..3c5689d 100644 --- a/configure.ac +++ b/configure.ac @@ -412,7 +412,7 @@ AC_ARG_ENABLE([vala], [], enable_vala="no") -VALA_REQUIRED=0.11.7 +VALA_REQUIRED=0.14 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..c1ae6c0 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 \ |