[gegl-gtk] vala: Respect GIRDIR and VAPIDIR environment variables

[Jon Nordby <jonnor src gnome org>]

commit 54c12d0f6ed598a96279dfdce6755e651ec768d4
Author: Jon Nordby <jononor gmail com>
Date:   Thu Apr 12 18:31:06 2012 +0200

    vala: Respect GIRDIR and VAPIDIR environment variables
    
    These can be used to specify where vapigen looks for .gir and .vapi files.
    Sadly it does not seem to respect XDG_DATA_DIRS like g-ir-scanner does..

 configure.ac         |   12 ++++++++++++
 gegl-gtk/Makefile.am |    5 +++--
 2 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 8e01ffc..33dc20d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -259,6 +259,11 @@ fi
 
 AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$enable_introspection" = "xyes")
 
+if test "x$GIRDIR" = "x"; then
+  GIRDIR=$(datadir)/vala/vapi
+fi
+AC_SUBST([GIRDIR])
+
 ########################
 # Check Vala
 ########################
@@ -280,6 +285,13 @@ fi
 have_vala=$have_vapigen
 AM_CONDITIONAL(HAVE_VALA, test "$have_vala" = "yes")
 
+if test "x$VAPIDIR" = "x"; then
+  VAPIDIR=$(datadir)/vala/vapi
+fi
+AC_SUBST([VAPIDIR])
+
+# `$PKG_CONFIG --variable=vapidir $valapkg`
+
 ######################################
 # Checks for gtk-doc and docbook-tools
 ######################################
diff --git a/gegl-gtk/Makefile.am b/gegl-gtk/Makefile.am
index a95af57..815b8aa 100644
--- a/gegl-gtk/Makefile.am
+++ b/gegl-gtk/Makefile.am
@@ -73,11 +73,12 @@ if HAVE_VALA
 gegl-gtk GEGL_GTK_GTK_VERSION@- GEGL_GTK_API_VERSION@.vapi: \
 	GeglGtk GEGL_GTK_GTK_VERSION@- GEGL_GTK_API_VERSION@.gir
 
-	$(VAPIGEN) --pkg gtk+- GEGL_GTK_GTK_VERSION@.0 \
+	$(VAPIGEN) --pkg gtk+- GEGL_GTK_GTK_VERSION@.0 --pkg Gegl-0.2 \
 	--library=gegl-gtk GEGL_GTK_GTK_VERSION@- GEGL_GTK_API_VERSION@ \
+	--vapidir= VAPIDIR@ --girdir= GIRDIR@ \
 	GeglGtk GEGL_GTK_GTK_VERSION@- GEGL_GTK_API_VERSION@.gir
 
-vapidir=$(datadir)/vala/vapi
+vapidir= VAPIDIR@
 vapi_DATA = \
 	gegl-gtk GEGL_GTK_GTK_VERSION@- GEGL_GTK_API_VERSION@.vapi \
 	gegl-gtk GEGL_GTK_GTK_VERSION@- GEGL_GTK_API_VERSION@.deps