Hash :
001db089
Author :
Date :
2012-04-21T15:51:09
vala: configure exit with status 77, not 1, if valac version is too old From a report by Bruno Haible in automake bug#1193. This change should also automatically avoid spurious testsuite failures with older vala versions. * m4/vala.m4 (AM_PROG_VALAC): Exit with status 77, rather than 1, if the Vala compiler found older than the minimal required version (if any). This is more consistent with what is done by other macros like AM_PROG_UPC or AC_PROG_CC. * NEWS: Update. * t/vala-headers.sh: Adjust, so that the test is only skipped of the vala compiler is too old or the required PKG_CHECK_MODULES third-party macro is not found by aclocal, and not if a generic error happens in the configure script. * t/vala-libs.sh: Likewise. * t/vala2.sh: Likewise. * t/vala3.sh: Likewise. * t/vala5.sh: Likewise. * t/vala-vpath.sh: Likewise (but don't check for the potential error with PKG_CHECK_MODULES, as that macro is not used in any way here). * t/vala4.sh: Adjust, to avoid the new semantic causing this test to skip instead of failing. Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103
#! /bin/sh
# Copyright (C) 1996-2012 Free Software Foundation, Inc.
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2, or (at your option)
# any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
# Test per-target flags.
required="pkg-config valac gcc GNUmake"
. ./defs || Exit 1
mkdir src
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.4])
AC_CONFIG_FILES([src/Makefile])
AC_OUTPUT
END
cat > Makefile.am <<'END'
SUBDIRS = src
END
cat > src/Makefile.am <<'END'
bin_PROGRAMS = foo bar
foo_CFLAGS = $(GOBJECT_CFLAGS)
foo_LDADD = $(GOBJECT_LIBS)
foo_SOURCES = xfoo.vala
bar_SOURCES = xbar.vala
bar_VALAFLAGS = -D BAR
bar_CFLAGS = $(GOBJECT_CFLAGS)
bar_LDADD = $(GOBJECT_LIBS)
END
cat > src/xfoo.vala <<'END'
int main ()
{
stdout.printf ("foo\n");
return 0;
}
END
cat > src/xbar.vala <<'END'
void main ()
{
#if BAR
stdout.printf ("bar\n");
#else
stdout.oops_an_invalid_method ();
#endif
}
END
$ACLOCAL
$AUTOCONF
$AUTOMAKE -a
grep PKG_CHECK_MODULES configure && skip_ "pkg-config m4 macros not found"
./configure
$MAKE
if cross_compiling; then :; else
./src/foo
./src/bar
test `./src/foo` = foo
test `./src/bar` = bar
fi
# Test clean rules.
cp config.status config.sav
$MAKE clean
test -f src/xfoo.c
test -f src/xbar.c
$MAKE distclean
test -f src/xfoo.c
test -f src/xbar.c
# Re-create Makefile.
mv config.sav config.status
./config.status
$MAKE maintainer-clean
test ! -f src/xfoo.c
test ! -f src/xbar.c
: