Fix AM_PROG_VALAC version requirement detection.

* m4/vala.m4 (AM_PROG_VALAC): Remove `Vala ' from valac
--version string before comparing versions.
* tests/vala2.test: Require version 0.7.0 for the test.
Fixes failures of vala2.test and vala3.test with older valac.

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

diff --git a/ChangeLog b/ChangeLog
index 8be052c1e53d11b419686ab101a0e538efee58c3..633e03968c79ab62a0567bfa4b12b78f507804b4 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-19  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+       Fix AM_PROG_VALAC version requirement detection.
+       * m4/vala.m4 (AM_PROG_VALAC): Remove `Vala ' from valac
+       --version string before comparing versions.
+       * tests/vala2.test: Require version 0.7.0 for the test.
+       Fixes failures of vala2.test and vala3.test with older valac.
+
        Correctly treat all assignments with bogus trailing comments.
        Before this patch, automake would silently fail to diagnose and
        to copy into the output those variable assignments which are

diff --git a/m4/vala.m4 b/m4/vala.m4
index d3f73a5d724b6e2587fd508593ef8677ba997920..d95734a4c4915963d8e411d051c794cbac86ca73 100644 (file)
--- a/m4/vala.m4
+++ b/m4/vala.m4
@@ -6,7 +6,7 @@
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 3
+# serial 4
 
 # Check whether the Vala compiler exists in `PATH'. If it is found, the
 # variable VALAC is set. Optionally a minimum release number of the
@@ -20,7 +20,7 @@ AC_DEFUN([AM_PROG_VALAC],
    [AC_MSG_WARN([No Vala compiler found.  You will not be able to compile .vala source files.])],
    [AS_IF([test -n "$1"],
       [AC_MSG_CHECKING([$VALAC is at least version $1])
-       am__vala_version=`$VALAC --version`
+       am__vala_version=`$VALAC --version | sed 's/Vala  *//'`
        AS_VERSION_COMPARE([$1], ["$am__vala_version"],
          [AC_MSG_RESULT([yes])],
          [AC_MSG_RESULT([yes])],

diff --git a/tests/vala2.test b/tests/vala2.test
index 6209aa6a49a53f6f4a470112c19b5d475c884df7..a6efba98af263ff29bf161dff0a875a1039d1f1a 100755 (executable)
--- a/tests/vala2.test
+++ b/tests/vala2.test
@@ -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
@@ -65,7 +65,7 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE -a
 
-./configure
+./configure || Exit 77
 $MAKE
 $MAKE distcheck
 $MAKE distclean