[totem/gnome-2-32] Fix incorrect Vala configure check

[Bastien Nocera <hadess src gnome org>]

commit 65690dc3992f46d45f8b0c800fc236fa4f16c909
Author: Simon Wenner <simon wenner ch>
Date:   Fri May 14 18:19:35 2010 +0200

    Fix incorrect Vala configure check
    
    https://bugzilla.gnome.org/show_bug.cgi?id=618546

 autogen.sh   |    2 +-
 configure.in |   17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index 5785484..ea854bf 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -17,4 +17,4 @@ which gnome-autogen.sh || {
 	exit 1
 }
 
-REQUIRED_PKG_CONFIG_VERSION=0.17.1 REQUIRED_AUTOMAKE_VERSION=1.9 USE_GNOME2_MACROS=1 . gnome-autogen.sh --enable-debug $*
+REQUIRED_PKG_CONFIG_VERSION=0.17.1 REQUIRED_AUTOMAKE_VERSION=1.11 USE_GNOME2_MACROS=1 . gnome-autogen.sh --enable-debug $*
diff --git a/configure.in b/configure.in
index 2c25d42..ca54d2b 100644
--- a/configure.in
+++ b/configure.in
@@ -12,7 +12,7 @@ AM_MAINTAINER_MODE
 AC_CONFIG_SRCDIR([src/totem.c])
 AC_CONFIG_HEADERS([config.h])
 
-AM_INIT_AUTOMAKE([1.9 dist-bzip2 no-dist-gzip check-news subdir-objects])
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 no-dist-gzip check-news subdir-objects])
 
 # Enable silent build when available (Automake 1.11)
 m4_ifdef([AM_SILENT_RULES],[AM_SILENT_RULES([yes])])
@@ -377,13 +377,14 @@ AC_ARG_ENABLE([vala],
 	[enable_vala=autodetect have_vala=yes])
 AC_MSG_RESULT([$enable_vala])
 if test "x$enable_vala" != "xno"; 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"
-		AC_SUBST([VALAC])
-	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")