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.

Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk>
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89846

diff --git a/configure.ac b/configure.ac
index 7443ae76c65a1da0fe003c3d0c3fcd2259c104b1..92ffad9e59cf5a253dcb2c91c6616060232d463c 100644 (file)
--- 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 e8831daf1133894959e13774996f92e45c11990e..b1ed5c9e0b8e97631c773ab38f32caea155cd69d 100644 (file)
--- 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) \