From 68caa9df33f06d6386d7e4a5f5d4a9c46aae14e6 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 2 Mar 2015 11:46:13 +0000 Subject: [PATCH 6/9] Depend on Automake 1.13 so we can use the correct AM_TESTS_ENVIRONMENT Since Automake 1.13 (released December 2012) the correct way for a maintainer to specify environment variables has been AM_TESTS_ENVIRONMENT, with TESTS_ENVIRONMENT reserved for the user. That doesn't work in older Automake, so drop support for such old versions. --- configure.ac | 2 +- test/Makefile.am | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index 7443ae7..92ffad9 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ AC_CANONICAL_HOST AC_CONFIG_HEADERS([config.h]) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE([1.10 tar-ustar -Wno-portability subdir-objects]) +AM_INIT_AUTOMAKE([1.13 tar-ustar -Wno-portability subdir-objects]) GETTEXT_PACKAGE=dbus-1 AC_SUBST(GETTEXT_PACKAGE) diff --git a/test/Makefile.am b/test/Makefile.am index e8831da..b1ed5c9 100644 --- a/test/Makefile.am +++ b/test/Makefile.am @@ -147,7 +147,7 @@ installcheck_environment = \ DBUS_TEST_HOMEDIR=@abs_top_builddir@/dbus \ DBUS_TEST_SYSCONFDIR=$(DESTDIR)$(sysconfdir) -TESTS_ENVIRONMENT = \ +AM_TESTS_ENVIRONMENT = \ XDG_RUNTIME_DIR=@abs_top_builddir@/test/XDG_RUNTIME_DIR \ DBUS_FATAL_WARNINGS=1 \ DBUS_TEST_DAEMON=@abs_top_builddir@/bus/dbus-daemon$(EXEEXT) \ @@ -255,7 +255,7 @@ endif DBUS_ENABLE_MODULAR_TESTS # do a portable equivalent of setting LD_LIBRARY_PATH. installcheck-local: $(MAKE) check-TESTS TESTS='$$(installcheck_tests)' \ - TESTS_ENVIRONMENT='$$(installcheck_environment)' + AM_TESTS_ENVIRONMENT='$$(installcheck_environment)' if DBUS_ENABLE_INSTALLED_TESTS test -n "$(DESTDIR)" || \ $(installcheck_environment) \ -- 2.1.4