[libgda] build: use AC_PATH_PROG for finding vapigen

[Vivien Malerba <vivien src gnome org>]

commit 0a50c7f3f9feb943fb6a10961fed83f4920dca9c
Author: Nirbheek Chauhan <nirbheek gentoo org>
Date:   Thu Nov 24 16:54:57 2011 +0530

    build: use AC_PATH_PROG for finding vapigen
    
    Also, use the commonly-used names for vala-related variables

 configure.ac       |   17 ++++++++---------
 libgda/Makefile.am |    4 ++--
 2 files changed, 10 insertions(+), 11 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 2c3241e..e982a31 100644
--- a/configure.ac
+++ b/configure.ac
@@ -490,14 +490,14 @@ then
 
     if test "x$have_vala" = "xyes"
     then
-	    VALA_BINDIR=`pkg-config $VALA_MODULES --variable=bindir`
-	    AC_SUBST(VALA_BINDIR)
-	    VALA_COMPILER="$VALA_BINDIR/valac"
-	    AC_SUBST(VALA_COMPILER)
-	    VALA_VAPIGEN=`pkg-config $VALA_MODULES --variable=vapigen`
-	    AC_SUBST(VALA_VAPIGEN)
-	    VALA_VAPIDIR=`pkg-config $VALA_MODULES --variable=vapidir`
-	    AC_SUBST(VALA_VAPIDIR)	    
+        AC_PATH_PROG(VAPIGEN, [vapigen], [no])
+        if test "x$VAPIGEN" = "xno"
+        then
+            AC_MSG_ERROR([Vala found but vapigen not found])
+        fi
+        VAPIDIR=`pkg-config $VALA_MODULES --variable=vapidir`
+        AC_SUBST(VAPIGEN)
+        AC_SUBST(VAPIDIR)
     fi
 else
     if test "x$enable_vala" = xyes
@@ -509,7 +509,6 @@ enable_vala=$have_vala
 AM_CONDITIONAL(ENABLE_VALA, [test "$enable_vala" = "yes"])
 
 
-
 dnl ******************************
 dnl Checks for libcrypto
 dnl ******************************
diff --git a/libgda/Makefile.am b/libgda/Makefile.am
index e55c963..f707e84 100644
--- a/libgda/Makefile.am
+++ b/libgda/Makefile.am
@@ -367,9 +367,9 @@ if ENABLE_VALA
 vapi: libgda-5.0.vapi
 
 libgda-5.0.vapi: Gda-5.0.gir
-	$(VALA_VAPIGEN) --metadatadir=$(top_srcdir)/libgda --library libgda-5.0 --pkg libxml-2.0 Gda-5.0.gir 
+	$(VAPIGEN) --metadatadir=$(top_srcdir)/libgda --library libgda-5.0 --pkg libxml-2.0 Gda-5.0.gir 
 
-vapidir = $(VALA_VAPIDIR)
+vapidir = $(VAPIDIR)
 vapi_DATA=libgda-5.0.vapi
 
 EXTRA_DIST += \