From 3bca4dc84939dbdf43e66cddc7cd030477f90b01 Mon Sep 17 00:00:00 2001 From: Ralf Wildenhues Date: Sun, 19 Apr 2009 09:47:01 +0200 Subject: [PATCH] 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 --- ChangeLog | 6 ++++++ m4/vala.m4 | 4 ++-- tests/vala2.test | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8be052c1e..633e03968 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,11 @@ 2009-04-19 Ralf Wildenhues + 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 d3f73a5d7..d95734a4c 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 6209aa6a4..a6efba98a 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 -- 2.47.2