diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-mix.test automake-1.11.6/tests/vala-mix.test --- automake-1.11.6.orig/tests/vala-mix.test 2012-07-09 11:39:58.000000000 -0400 +++ automake-1.11.6/tests/vala-mix.test 2013-08-27 04:35:17.000000000 -0400 @@ -16,7 +16,7 @@ # Vala sources and C sources in the same program. Functional test. -required='valac cc GNUmake' +required='valac cc pkg-config GNUmake' . ./defs || Exit 1 set -e @@ -25,16 +25,18 @@ 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_CFLAGS = -DHAVE_MU $(GOBJECT_CFLAGS) baz_SOURCES = baz.c END diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-mix2.test automake-1.11.6/tests/vala-mix2.test --- automake-1.11.6.orig/tests/vala-mix2.test 2012-07-09 11:39:58.000000000 -0400 +++ automake-1.11.6/tests/vala-mix2.test 2013-08-26 23:31:08.000000000 -0400 @@ -17,7 +17,7 @@ # 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' . ./defs || Exit 1 set -e @@ -26,12 +26,14 @@ 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 diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-vapi.test automake-1.11.6/tests/vala-vapi.test --- automake-1.11.6.orig/tests/vala-vapi.test 2012-07-09 11:39:58.000000000 -0400 +++ automake-1.11.6/tests/vala-vapi.test 2013-08-26 23:32:24.000000000 -0400 @@ -16,7 +16,7 @@ # Test and that vapi files are correctly handled by Vala support. -required='valac cc GNUmake' +required='pkg-config valac cc GNUmake' . ./defs || Exit 1 set -e @@ -25,12 +25,14 @@ 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 -AM_VALAFLAGS = --profile=posix +AM_CFLAGS = $(GOBJECT_CFLAGS) +LDADD = $(GOBJECT_LIBS) zardoz_SOURCES = zardoz.vala foo.vapi foo.h END @@ -42,7 +44,9 @@ } END -echo '#define BARBAR "Zardoz!\n"' > foo.h +# Use printf, not echo, to avoid '\n' being considered and escape +# sequence and printed as a newline in 'foo.h'. +printf '%s\n' '#define BARBAR "Zardoz!\n"' > foo.h cat > foo.vapi <<'END' [CCode (cprefix="", lower_case_cprefix="", cheader_filename="foo.h")] @@ -76,7 +80,9 @@ # Simple check on remake rules. $sleep -echo '#define BAZBAZ "Quux!\n"' > foo.h +# Use printf, not echo, to avoid '\n' being considered and escape +# sequence and printed as a newline in 'foo.h'. +printf '%s\n' '#define BAZBAZ "Quux!\n"' > foo.h sed 's/BARBAR/BAZBAZ/' zardoz.vala > t && mv -f t zardoz.vala || Exit 99 $MAKE && Exit 1 sed 's/BARBAR/BAZBAZ/' foo.vapi > t && mv -f t foo.vapi || Exit 99 diff -Nurd -x'*~' automake-1.11.6.orig/tests/vala-vpath.test automake-1.11.6/tests/vala-vpath.test --- automake-1.11.6.orig/tests/vala-vpath.test 2012-07-09 11:39:58.000000000 -0400 +++ automake-1.11.6/tests/vala-vpath.test 2013-08-26 23:30:41.000000000 -0400 @@ -17,7 +17,7 @@ # Test to make sure vala support handles from-scratch VPATH builds. # See automake bug#8753. -required="valac GNUmake" +required="valac pkg-config GNUmake" . ./defs || Exit 1 set -e @@ -26,12 +26,14 @@ AC_CONFIG_SRCDIR([hello.vala]) AC_PROG_CC AM_PROG_VALAC([0.7.3]) +PKG_CHECK_MODULES([GOBJECT], [gobject-2.0 >= 2.4]) AC_OUTPUT END cat > Makefile.am <<'END' bin_PROGRAMS = foo -foo_VALAFLAGS = --profile=posix +AM_CFLAGS = $(GOBJECT_CFLAGS) +LDADD = $(GOBJECT_LIBS) foo_SOURCES = hello.vala END