[rhythmbox] stop using pkg-config to find vala (bug #628330)

[Jonathan Matthew <jmatthew src gnome org>]

commit 0ca2c0c065cc89f6315ba146ccc8ea995598e337
Author: Dominique Leuenberger <dominique-gnomezilla leuenberger net>
Date:   Sun Oct 31 19:56:10 2010 +1000

    stop using pkg-config to find vala (bug #628330)

 bindings/vala/Makefile.am |    2 +-
 configure.ac              |   17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)
---
diff --git a/bindings/vala/Makefile.am b/bindings/vala/Makefile.am
index 579ac4f..0b542d3 100644
--- a/bindings/vala/Makefile.am
+++ b/bindings/vala/Makefile.am
@@ -1,4 +1,4 @@
-vapidir = $(VAPIDIR)
+vapidir = $(datadir)/vala/vapi
 
 vapi_VAPI = 			\
 	rb.vapi			\
diff --git a/configure.ac b/configure.ac
index a1979c6..d1f366a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -746,15 +746,14 @@ AC_ARG_ENABLE([vala],
 	[enable_vala=autodetect have_vala=yes])
 AC_MSG_RESULT([$enable_vala])
 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`"
-		AC_SUBST([VALAC])
-		AC_SUBST([VAPIDIR])
-	elif test "x$enable_vala" = "xyes"; then
-		AC_MSG_ERROR([Vala plugin support explicitly requested, but not found])
+	AM_PROG_VALAC([$VALA_REQS])
+	if test "x$VALAC" = "x"; then
+		if test "x$enable_vala" = "xyes"; then
+			AC_MSG_ERROR([Vala plugin support explicitly requested, but not found])
+		fi
+		with_vala=no
+	else
+		with_vala=yes
 	fi
 fi
 AM_CONDITIONAL(ENABLE_VALA, test "x$with_vala" = "xyes")