]> git.ipfire.org Git - thirdparty/automake.git/commitdiff
vala tests: avoid spurious failure with older GObject
authorStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 11 Apr 2012 15:31:04 +0000 (17:31 +0200)
committerStefano Lattarini <stefano.lattarini@gmail.com>
Wed, 11 Apr 2012 15:31:28 +0000 (17:31 +0200)
* 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 <stefano.lattarini@gmail.com>
t/vala2.sh
t/vala3.sh
t/vala5.sh

index cceed5495cbb69617a860cab9324caeea5f98610..2b140b5e088fef008f95587d71778cbf6aa7b0c7 100755 (executable)
@@ -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
index c93db9a9b5c3b47b54df2f413bd3feb449beb0a0..af8fcb5bddb4c93998613b710c9f3d727f7a37dc 100755 (executable)
@@ -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
 
index 79fb316232f9b0b009f819a787c99a45fcabbb7d..26f391ad4f161d6a19abb0f7f6b7347689c54b6a 100755 (executable)
@@ -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