diff options
| author | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-26 14:48:29 +0100 |
|---|---|---|
| committer | Stefano Lattarini <stefano.lattarini@gmail.com> | 2012-11-26 15:02:07 +0100 |
| commit | 3e98c9d66b926a50ea7cabce7992bd30da2c6fb8 (patch) | |
| tree | d40c0f90852d3a21bb9ba121148dac8f4f2993b2 /t/vala-mix.sh | |
| parent | 1df23e4ad00a924fcff94b0894b1d9de2a497300 (diff) | |
| download | automake-3e98c9d66b926a50ea7cabce7992bd30da2c6fb8.tar.gz | |
vala tests: don't use the 'posix' profile, it's no longer supported
Fixes automake bug#12934 a.k.a. bug#12522.
Some of automake's Vala tests used to rely on "valac --profile posix"
(which makes it not use glib). However, the posix profile was removed
in August 2012, and is no longer present in the GNOME 3.6.2 version
of valac (see commit ca020bf0 in the vala Git repository).
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
* t/vala-libs.sh: Adjust to avoid using the posix profile.
* t/vala-mix.sh: Likewise.
* t/vala-mix2.sh: Likewise.
* t/vala-parallel.sh: Likewise.
* t/vala-vapi.sh: Likewise.
* t/vala-vpath.sh: Likewise.
* NEWS: Update and adjust.
Signed-off-by: Stefano Lattarini <stefano.lattarini@gmail.com>
Diffstat (limited to 't/vala-mix.sh')
| -rwxr-xr-x | t/vala-mix.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/t/vala-mix.sh b/t/vala-mix.sh index 5e2e7ce28..44b5a3b5a 100755 --- a/t/vala-mix.sh +++ b/t/vala-mix.sh @@ -16,23 +16,25 @@ # Vala sources and C sources in the same program. Functional test. -required='valac cc GNUmake' +required='valac cc pkg-config GNUmake' . test-init.sh cat >> configure.ac <<'END' AC_PROG_CC AM_PROG_CC_C_O AM_PROG_VALAC([0.7.3]) +PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4]) AC_OUTPUT END cat > Makefile.am <<'END' bin_PROGRAMS = zardoz mu baz -AM_VALAFLAGS = --profile=posix +AM_CFLAGS = $(GOBJECT_CFLAGS) +LDADD = $(GOBJECT_LIBS) zardoz_SOURCES = foo.vala bar.c mu_SOURCES = 1.vala 2.c -mu_VALAFLAGS = $(AM_VALAFLAGS) --main=run -mu_CFLAGS = -DHAVE_MU +mu_VALAFLAGS = --main=run +mu_CFLAGS = -DHAVE_MU $(AM_CFLAGS) baz_SOURCES = baz.c END |