cpw.qulogic.vala: 51f82cff: Updated Vala library checks.

[qulogic at pidgin.im]

----------------------------------------------------------------------
Revision: 51f82cff9758e3adb5894eff0355c0f1cb85df68
Parent:   409eec7598d49b079c60304f4de6640e008fd29e
Author:   qulogic at pidgin.im
Date:     03/21/12 01:25:55
Branch:   im.pidgin.cpw.qulogic.vala
URL: http://d.pidgin.im/viewmtn/revision/info/51f82cff9758e3adb5894eff0355c0f1cb85df68

Changelog: 

Updated Vala library checks.

Changes against parent 409eec7598d49b079c60304f4de6640e008fd29e

  patched  configure.ac

-------------- next part --------------
============================================================
--- configure.ac	f909636ba5a3ff660cb401923f1b210c662d00b1
+++ configure.ac	87a034344bb18c248fe4f2959104a50790084ced
@@ -1664,9 +1664,15 @@ if test "x$enable_vala" != "xno"; then
 VALA_REQUIRED=0.8.0
 
 if test "x$enable_vala" != "xno"; then
-	PKG_CHECK_MODULES(VALA, vala-0.10 >= "$VALA_REQUIRED", [VALA_PKG=0.10], [
-		PKG_CHECK_MODULES(VALA, [vala-1.0 >= "$VALA_REQUIRED"], [VALA_PKG=1.0])
-		])
+	for pkg in libvala-0.14 libvala-0.12 vala-0.10 vala-1.0; do
+		PKG_CHECK_MODULES(VALA, [$pkg >= $VALA_REQUIRED], [VALA_PKG=$pkg], [])
+		if test "x$VALA_PKG" != "x" ; then
+			break
+		fi
+	done
+	if test "x$VALA_PKG" = "x" ; then
+		AC_MSG_ERROR([Cannot find the Vala libraries])
+	fi
 	dnl AM_PROG_VALA was added in automake 1.11
 	m4_ifdef([AM_PROG_VALA],[AM_PROG_VALA($VALA_REQUIRED)],[AC_PATH_PROG(VALAC, valac)])
 	if test "x$VALAC" = "x" ; then
@@ -1676,7 +1682,7 @@ if test "x$enable_vala" != "xno"; then
 	# vala-gen-introspect is useless, but it's just a wrapper,
 	#  so we go use the real parser
 	AC_MSG_CHECKING(for vala/gen-introspect)
-	VALA_GEN_INTROSPECT=`$PKG_CONFIG --variable=gen_introspect vala-$VALA_PKG`
+	VALA_GEN_INTROSPECT=`$PKG_CONFIG --variable=gen_introspect $VALA_PKG`
 	if test "x$VALA_GEN_INTROSPECT" = "x"; then
 		AC_MSG_RESULT(no)
 		AC_MSG_ERROR([Cannot find "vala/gen-introspect"])
@@ -1694,7 +1700,7 @@ if test "x$enable_vala" != "xno"; then
 	AC_MSG_CHECKING(for vapidir)
 	VAPIDIR=""
 	if test "x$with_vapidir" = "x" ; then
-		VAPIDIR=`$PKG_CONFIG --variable=vapidir vala-$VALA_PKG`
+		VAPIDIR=`$PKG_CONFIG --variable=vapidir $VALA_PKG`
 	else
 		VAPIDIR="$with_vapidir"
 	fi