[rhythmbox/gobject-introspection: 123/205] bungle vala detection

[Jonathan Matthew <jmatthew src gnome org>]

commit 40dfb9e888329eb10004acce8325c30a827c0aba
Author: Jonathan Matthew <jonathan d14n org>
Date:   Thu Sep 23 15:51:35 2010 +1000

    bungle vala detection

 configure.ac |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 98ae688..13d1d0e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -764,16 +764,17 @@ AC_ARG_ENABLE([vala],
 	[enable_vala=$enableval have_vala=$enableval],
 	[enable_vala=autodetect have_vala=yes])
 AC_MSG_RESULT([$enable_vala])
+with_vala=no
 if test "x$enable_vala" = "xyes"; then
-	PKG_CHECK_MODULES(VALA, vala-1.0 >= $VALA_REQS, with_vala=yes,
-		          with_vala=no)
-	if test "x$with_vala" = "xyes"; then
-		VALAC="`pkg-config --variable=prefix vala-1.0`/bin/valac"
-		VAPIDIR="`pkg-config --variable=vapidir vala-1.0`"
-		VAPIGEN="`pkg-config --variable=vapigen vala-1.0`"
+	AM_PROG_VALAC([$VALA_REQS])
+	if test "x$VALAC" != "x"; then
+		VAPIDIR=$datadir/vala/vapi
+		# what?
+		VAPIGEN=vapigen
 		AC_SUBST([VALAC])
 		AC_SUBST([VAPIDIR])
 		AC_SUBST([VAPIGEN])
+		with_vala=yes
 	elif test "x$enable_vala" = "xyes"; then
 		AC_MSG_ERROR([Vala plugin support explicitly requested, but not found])
 	fi