[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.10b-38-g3bca4dc

[Ralf Wildenhues]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Automake".

http://git.sv.gnu.org/gitweb/?p=automake.git;a=commitdiff;h=3bca4dc84939dbdf43e66cddc7cd030477f90b01

The branch, master has been updated
       via  3bca4dc84939dbdf43e66cddc7cd030477f90b01 (commit)
      from  c5635fa68f25ea688578daed8ac503b718761206 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3bca4dc84939dbdf43e66cddc7cd030477f90b01
Author: Ralf Wildenhues <address@hidden>
Date:   Sun Apr 19 09:47:01 2009 +0200

    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 <address@hidden>

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog        |    6 ++++++
 m4/vala.m4       |    4 ++--
 tests/vala2.test |    4 ++--
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 8be052c..633e039 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
 2009-04-19  Ralf Wildenhues  <address@hidden>
 
+       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 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"],
          [AC_MSG_RESULT([yes])],
          [AC_MSG_RESULT([yes])],
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 >> '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


hooks/post-receive
--
GNU Automake