summaryrefslogtreecommitdiff
path: root/t/vala-mix2.sh
diff options
context:
space:
mode:
authorStefano Lattarini <stefano.lattarini@gmail.com>2012-11-26 14:48:29 +0100
committerStefano Lattarini <stefano.lattarini@gmail.com>2012-11-26 15:02:07 +0100
commit3e98c9d66b926a50ea7cabce7992bd30da2c6fb8 (patch)
treed40c0f90852d3a21bb9ba121148dac8f4f2993b2 /t/vala-mix2.sh
parent1df23e4ad00a924fcff94b0894b1d9de2a497300 (diff)
downloadautomake-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-mix2.sh')
-rwxr-xr-xt/vala-mix2.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/t/vala-mix2.sh b/t/vala-mix2.sh
index 9b2402dec..3e823e243 100755
--- a/t/vala-mix2.sh
+++ b/t/vala-mix2.sh
@@ -17,19 +17,21 @@
# Vala sources, C and C++ sources and C and C++ headers in the same
# program. Functional test. See automake bug#10894.
-required='valac cc c++ GNUmake'
+required='valac cc c++ pkg-config GNUmake'
. test-init.sh
cat >> configure.ac <<'END'
AC_PROG_CC
AC_PROG_CXX
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
-AM_VALAFLAGS = --profile=posix
+AM_CFLAGS = $(GOBJECT_CFLAGS)
+zardoz_LDADD = $(GOBJECT_LIBS)
zardoz_SOURCES = zardoz.vala foo.h bar.c baz.c zen.hh master.cxx
END