[gedit-code-assistance] Use vapi distributed from gtksourceview if possible

[Jesse van den Kieboom <jessevdk src gnome org>]

commit 7f5952b95550b8515d24db4eeba4d08a689def31
Author: Jesse van den Kieboom <jessevdk gmail com>
Date:   Sat Sep 6 13:42:07 2014 +0200

    Use vapi distributed from gtksourceview if possible

 Makefile.am                                        |    1 +
 configure.ac                                       |   10 ++++++++++
 src/Makefile.am                                    |    3 ++-
 vapi-gtksourceview/Makefile.am                     |    4 ++++
 .../gtksourceview-3.0.vapi                         |    0
 vapi/Makefile.am                                   |    3 +--
 6 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index c27c8b0..e96479e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -35,6 +35,7 @@ geditcodeassistanceplugindir = $(GEDIT_PLUGIN_DIR)
 include data/Makefile.am
 include src/Makefile.am
 include vapi/Makefile.am
+include vapi-gtksourceview/Makefile.am
 include indentbackends/Makefile.am
 
 dist-hook-changelog:
diff --git a/configure.ac b/configure.ac
index 2f19f7f..c093921 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,6 +59,16 @@ AC_SUBST(GEDIT_GIR_DIR)
 GEDIT_API_VERSION=3.0
 AC_SUBST(GEDIT_API_VERSION)
 
+PKG_CHECK_EXISTS([
+       gtksourceview-3.0 >= 3.13.90
+], [
+       EXTRA_VAPI_DIRS=
+], [
+       EXTRA_VAPI_DIRS="--vapidir \"\$(top_srcdir)/vapi-gtksourceview\""
+])
+
+AC_SUBST(EXTRA_VAPI_DIRS)
+
 if test "x$enable_local" = "xyes"; then
        geditlibdir="$HOME/.local/share"
        geditdatadir="$HOME/.local/share"
diff --git a/src/Makefile.am b/src/Makefile.am
index 0e2bd62..e534bdb 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -40,7 +40,8 @@ src_libcodeassistance_la_SOURCES =            \
        src/gca-utils-c.c
 
 src_libcodeassistance_la_VALAFLAGS =                           \
-       --vapidir $(builddir)/vapi                              \
+       --vapidir $(top_srcdir)/vapi                            \
+       $(EXTRA_VAPI_DIRS)                                      \
        --header src/gca.h                                      \
        --vapi src/gca.vapi                                     \
        --library libcodeassistance                             \
diff --git a/vapi-gtksourceview/Makefile.am b/vapi-gtksourceview/Makefile.am
new file mode 100644
index 0000000..267054c
--- /dev/null
+++ b/vapi-gtksourceview/Makefile.am
@@ -0,0 +1,4 @@
+EXTRA_DIST +=
+       vapi-gtksourceview/gtksourceview-3.0.vapi
+
+GITIGNOREDEPS += vapi-gtksourceview/Makefile.am
diff --git a/vapi/gtksourceview-3.0.vapi b/vapi-gtksourceview/gtksourceview-3.0.vapi
similarity index 100%
rename from vapi/gtksourceview-3.0.vapi
rename to vapi-gtksourceview/gtksourceview-3.0.vapi
diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 7b72cd4..20fdf3e 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -1,5 +1,4 @@
 EXTRA_DIST +=                                  \
-       vapi/gca-utils.vapi                     \
-       vapi/gtksourceview-3.0.vapi
+       vapi/gca-utils.vapi
 
 GITIGNOREDEPS += vapi/Makefile.am