[gnome-boxes/wip/always-valac] tmp

[Zeeshan Ali Khattak <zeeshanak src gnome org>]

commit 851a646b19f001dac578f2818fac10d8d9644719
Author: Zeeshan Ali (Khattak) <zeeshanak gnome org>
Date:   Thu May 14 15:23:44 2015 +0100

    tmp

 Makefile.am     |    4 ----
 autogen.sh      |    2 +-
 configure.ac    |   47 +++++++++++++++++++++--------------------------
 m4/boxes.m4     |   43 -------------------------------------------
 src/Makefile.am |   21 ++++++++++-----------
 5 files changed, 32 insertions(+), 85 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 59d2470..df87165 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,7 +21,6 @@ EXTRA_DIST =                                  \
        THANKS                                  \
        HACKING                                 \
        build-aux/git-version-gen               \
-       m4/boxes.m4                             \
        .version                                \
        $(INTLTOOL_FILES)                       \
        $(NULL)
@@ -67,9 +66,6 @@ $(top_srcdir)/.version:
 
 all:
 
-vala-clean:
-       rm -f `find . -name "*.stamp"`
-
 win-tools.iso:
        @wget -O $@ 
http://people.gnome.org/~teuf/gnome-boxes/boxes-unattended-win-drivers/boxes-unattended-win-drivers-LATEST.iso
 
diff --git a/autogen.sh b/autogen.sh
index 0360ecd..754269f 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -10,5 +10,5 @@ autoreconf -v --force --install
 intltoolize -f
 
 if [ -z "$NOCONFIGURE" ]; then
-    "$srcdir"/configure --enable-maintainer-mode --enable-vala --enable-debug ${1+"$@"}
+    "$srcdir"/configure --enable-maintainer-mode --enable-debug ${1+"$@"}
 fi
diff --git a/configure.ac b/configure.ac
index 1148862..57d152b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,20 +91,12 @@ PKG_CHECK_MODULES(TRACKER, [tracker-sparql-1.0 >= $TRACKER_SPARQL], [TRACKER_VER
 )
 AC_SUBST(TRACKER_VERSION)
 
-
-VALA_ADD_CHECKFILE([src/gnome_boxes_vala.stamp])
-
 PKG_CHECK_MODULES(BOXES_COMMON, [
   glib-2.0 >= $GLIB_MIN_VERSION
   gio-2.0 >= $GLIB_MIN_VERSION
   libarchive >= $LIBARCHIVE_MIN_VERSION
 ])
 
-VALA_ADD_CHECKFILE([src/libcommon_vala.stamp])
-VALA_ADD_CHECKFILE([src/gnome_boxes_search_provider_vala.stamp])
-
-VALA_ADD_CHECKFILE([libgd/gd-1.0.vapi])
-
 AC_ARG_ENABLE(ovirt,
               AS_HELP_STRING([--enable-ovirt=yes|no|auto], [Enable support for OVirt]),
               [enable_ovirt=$enableval],
@@ -132,23 +124,27 @@ else
 fi
 AM_CONDITIONAL([HAVE_OVIRT], [test "x$have_govirt" = "xyes"])
 
-VALA_CHECK([0.24.0.65], [
-  gdk-pixbuf-2.0
-  glib-2.0
-  gtk+-3.0
-  gtk-vnc-2.0
-  gudev-1.0
-  libarchive
-  libosinfo-1.0
-  libsoup-2.4
-  libvirt-gconfig-1.0
-  libvirt-gobject-1.0
-  libxml-2.0
-  posix
-  rest-0.7
-  libusb-1.0
-  spice-client-gtk-3.0
-])
+dnl check for vala
+AM_PROG_VALAC([0.24.0.65])
+AS_IF([test x$VALAC = "x"],
+      [AC_MSG_ERROR([Cannot find the "valac" compiler in your PATH])],
+      [VALA_CHECK_PACKAGES( [
+          gdk-pixbuf-2.0
+          glib-2.0
+          gtk+-3.0
+          gtk-vnc-2.0
+          gudev-1.0
+          libarchive
+          libosinfo-1.0
+          libsoup-2.4
+          libvirt-gconfig-1.0
+          libvirt-gobject-1.0
+          libxml-2.0
+          posix
+          rest-0.7
+          libusb-1.0
+          spice-client-gtk-3.0
+      ])])
 
 dnl libgd
 LIBGD_INIT([
@@ -220,7 +216,6 @@ AC_MSG_NOTICE([
 
         prefix:                   ${prefix}
         c compiler:               ${CC} ${CFLAGS}
-        build from vala sources:  $enable_vala
         USB redirection support:  $enable_usbredir
         Smartcard support:        $enable_smartcard
         oVirt support:            $have_govirt
diff --git a/src/Makefile.am b/src/Makefile.am
index 6e66c84..16c78c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,7 +1,7 @@
 NULL =
 BUILT_SOURCES =
 EXTRA_DIST =
-MAINTAINERCLEANFILES = *.stamp
+CLEANFILES = *.stamp
 
 cachedir=/var/cache/
 AM_CPPFLAGS =                                          \
@@ -64,7 +64,7 @@ libcommon_a_SOURCES =                         \
        $(libcommon_a_VALASOURCES:.vala=.c)     \
        $(NULL)
 
-libcommon_a_CFLAGS = $(BOXES_COMMON_CFLAGS)
+libcommon_a_CFLAGS = $(BOXES_COMMON_CFLAGS) -I$(top_srcdir)/src
 
 libcommon_vala.stamp: $(libcommon_a_VALASOURCES)
        $(AM_V_VALAC)$(VALAC) $(VALAFLAGS) $(VALA_DEBUG_FLAGS)  \
@@ -85,10 +85,9 @@ resource_files = $(shell $(GLIB_COMPILE_RESOURCES) --generate-dependencies --sou
 resources.c: $(gresource_file) $(resource_files)
        $(AM_V_GEN) $(GLIB_COMPILE_RESOURCES) --target=$@ --sourcedir=$(top_srcdir)/data --generate-source $<
 
-MAINTAINERCLEANFILES += $(libcommon_a_SOURCES) $(libcommon_a_DEPENDENCIES)
+CLEANFILES += $(libcommon_a_SOURCES) $(libcommon_a_DEPENDENCIES)
 BUILT_SOURCES += resources.c
-EXTRA_DIST += $(libcommon_a_DEPENDENCIES) \
-             $(libcommon_a_VALASOURCES)  \
+EXTRA_DIST += $(libcommon_a_VALASOURCES)  \
              $(gresource_file)
 
 bin_PROGRAMS = gnome-boxes
@@ -164,8 +163,8 @@ gnome_boxes_LDADD =                         \
        libcommon.a                             \
        $(NULL)
 
-gnome_boxes_CFLAGS = $(BOXES_CFLAGS) $(TRACKER_CFLAGS)
-$(srcdir)/gnome_boxes_vala.stamp: $(libcommon_a_DEPENDENCIES)
+gnome_boxes_CFLAGS = $(BOXES_CFLAGS) $(TRACKER_CFLAGS) -I$(top_srcdir)/src
+gnome_boxes_vala.stamp: $(libcommon_a_DEPENDENCIES)
 
 AM_VALAFLAGS += --pkg govirt-1.0 --pkg rest-0.7
 if HAVE_OVIRT
@@ -174,7 +173,7 @@ gnome_boxes_LDADD += $(OVIRT_LIBS)
 gnome_boxes_CFLAGS += $(OVIRT_CFLAGS)
 endif
 
-MAINTAINERCLEANFILES += $(gnome_boxes_SOURCES:.vala=.c)
+CLEANFILES += $(gnome_boxes_SOURCES:.vala=.c)
 
 libexec_PROGRAMS = gnome-boxes-search-provider
 
@@ -183,10 +182,10 @@ gnome_boxes_search_provider_SOURCES =             \
        $(NULL)
 
 gnome_boxes_search_provider_LDADD = libcommon.a $(BOXES_COMMON_LIBS)
-gnome_boxes_search_provider_CFLAGS = $(BOXES_COMMON_CFLAGS)
-$(srcdir)/gnome_boxes_search_provider_vala.stamp: $(libcommon_a_DEPENDENCIES)
+gnome_boxes_search_provider_CFLAGS = $(BOXES_COMMON_CFLAGS) -I$(top_srcdir)/src
+gnome_boxes_search_provider_vala.stamp: $(libcommon_a_DEPENDENCIES)
 
-MAINTAINERCLEANFILES += $(gnome_boxes_search_provider_SOURCES:.vala=.c)
+CLEANFILES += $(gnome_boxes_search_provider_SOURCES:.vala=.c)
 
 EXTRA_DIST += config.vapi