[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Vala support for automake

From: Ralf Wildenhues
Subject: Re: Vala support for automake
Date: Sun, 19 Apr 2009 10:05:22 +0200
User-agent: Mutt/1.5.18 (2008-05-17)

Of course my testing went a bit overboard before merging, so I actually
missed a couple of vala-related failures.  Fixed with this patch, pushed
to master.  (next has been merged into master.)


    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.

diff --git a/m4/vala.m4 b/m4/vala.m4
index d3f73a5..d95734a 100644
--- 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"],
diff --git a/tests/vala2.test b/tests/vala2.test
index 6209aa6..a6efba9 100755
--- a/tests/vala2.test
+++ b/tests/vala2.test
@@ -32,7 +32,7 @@ cat >> '' << 'END'
 PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10])
@@ -65,7 +65,7 @@ $ACLOCAL
+./configure || Exit 77
 $MAKE distcheck
 $MAKE distclean

reply via email to

[Prev in Thread] Current Thread [Next in Thread]