From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Mon, 18 May 2009 18:52:59 +0000 (+0200)
Subject: Fix test failure when pkg.m4 is not found, only pkg-config.
X-Git-Tag: v1.11.1~18^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c87d38b4db0e899509bc9a0e6a659f0f4a67bc6a;p=thirdparty%2Fautomake.git

Fix test failure when pkg.m4 is not found, only pkg-config.

* tests/vala5.test: Update comment, this test is not expected to
fail any more.  Require valac version 0.7.0.  Skip if configure
fails, could be due to unexpanded PKG_CHECK_MODULES or too old
valac.
Report by Simon Josefsson.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---

diff --git a/ChangeLog b/ChangeLog
index a159858f2..c86d40c3d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2009-05-18  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
+
+	Fix test failure when pkg.m4 is not found, only pkg-config.
+	* tests/vala5.test: Update comment, this test is not expected to
+	fail any more.  Require valac version 0.7.0.  Skip if configure
+	fails, could be due to unexpanded PKG_CHECK_MODULES or too old
+	valac.
+	Report by Simon Josefsson.
+
 2009-05-17  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Automake 1.11.
diff --git a/tests/vala5.test b/tests/vala5.test
index 172a50fab..8fc703c4f 100755
--- a/tests/vala5.test
+++ b/tests/vala5.test
@@ -19,7 +19,7 @@
 # the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
-# Test per-target flags, expected to fail.
+# Test per-target flags.
 
 required="libtool libtoolize pkg-config valac gcc GNUmake"
 . ./defs || Exit 1
@@ -32,7 +32,7 @@ cat >> 'configure.in' << 'END'
 AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
-AM_PROG_VALAC
+AM_PROG_VALAC([0.7.0])
 PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10])
 AC_CONFIG_FILES([src/Makefile])
 AC_OUTPUT
@@ -69,6 +69,6 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 
-./configure
+./configure || Exit 77
 $MAKE