[Automake-commit] [SCM] GNU Automake branch, master, updated. v1.11-2140-g3d5d5ea

[Stefano Lattarini]

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=3d5d5eace287c0aad4a1e9221dcebc62e2a886ee

The branch, master has been updated
       via  3d5d5eace287c0aad4a1e9221dcebc62e2a886ee (commit)
      from  e306fb5d1043c60b46128fb09ee54434340a0d42 (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 3d5d5eace287c0aad4a1e9221dcebc62e2a886ee
Author: Stefano Lattarini <address@hidden>
Date:   Wed Apr 11 17:31:04 2012 +0200

    vala tests: avoid spurious failure with older GObject
    
    * t/vala2.sh: In the 'PKG_CHECK_MODULES' call in 'configure.ac',
    don't require gobject >= 2.10, but just >= 2.4: that is enough in
    order for the test to pass.
    * t/vala3.sh: Likewise.
    * t/vala5.sh: Likewise.  Also, skip the test instead of failing
    if the ./configure invocation fails: that is likely due to the
    fact that the GObject library is too old or missing, and that is
    not automake's fault.
    
    Signed-off-by: Stefano Lattarini <address@hidden>

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

Summary of changes:
 t/vala2.sh |    2 +-
 t/vala3.sh |    2 +-
 t/vala5.sh |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/t/vala2.sh b/t/vala2.sh
index cceed54..2b140b5 100755
--- a/t/vala2.sh
+++ b/t/vala2.sh
@@ -26,7 +26,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 AM_PROG_VALAC([0.7.0])
-PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_CONFIG_FILES([src/Makefile])
 AC_OUTPUT
 END
diff --git a/t/vala3.sh b/t/vala3.sh
index c93db9a..af8fcb5 100755
--- a/t/vala3.sh
+++ b/t/vala3.sh
@@ -26,7 +26,7 @@ AC_PROG_CC
 AM_PROG_CC_C_O
 AC_PROG_LIBTOOL
 AM_PROG_VALAC([0.7.0])
-PKG_CHECK_MODULES([GOBJECT],[gobject-2.0 >= 2.10])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_OUTPUT
 END
 
diff --git a/t/vala5.sh b/t/vala5.sh
index 79fb316..26f391a 100755
--- a/t/vala5.sh
+++ b/t/vala5.sh
@@ -25,7 +25,7 @@ cat >> configure.ac <<'END'
 AC_PROG_CC
 AM_PROG_CC_C_O
 AM_PROG_VALAC([0.7.0])
-PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.10])
+PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4])
 AC_CONFIG_FILES([src/Makefile])
 AC_OUTPUT
 END
@@ -70,7 +70,7 @@ $AUTOMAKE -a
 
 grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found"
 
-./configure
+./configure || skip_ "configure failure"
 $MAKE
 
 if cross_compiling; then :; else


hooks/post-receive
-- 
GNU Automake