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 a159858f2697004efc37931fdf3c501dd6c8141d..c86d40c3d960c60ae434c105734a4678b2d210d6 100644 (file)
--- 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 172a50fab42d0d84962d2b91623dca7a9d5ec847..8fc703c4f72e24780b465002e5616bd16dadbd14 100755 (executable)
--- 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