From: Thomas D <whissi@whissi.de>
Date: Sat, 14 Feb 2015 13:23:25 +0000 (+0100)
Subject: Make parallel test harness work with automake-1.11
X-Git-Tag: dnsdist-1.0.0-alpha1~285^2~2
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=afbdd9f0ab00626719dff96021e12761df106ffe;p=thirdparty%2Fpdns.git

Make parallel test harness work with automake-1.11
---

diff --git a/configure.ac b/configure.ac
index cde58a67d7..7de39f7d24 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,7 +10,7 @@ AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_HEADERS([config.h])
 AC_CONFIG_AUX_DIR([build-aux])
 
-AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar -Wno-portability subdir-objects 1.11])
+AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-ustar -Wno-portability subdir-objects parallel-tests 1.11])
 AM_SILENT_RULES([yes])
 
 AC_CANONICAL_HOST
diff --git a/modules/remotebackend/Makefile.am b/modules/remotebackend/Makefile.am
index 4aa0a548bb..34f0468471 100644
--- a/modules/remotebackend/Makefile.am
+++ b/modules/remotebackend/Makefile.am
@@ -53,7 +53,7 @@ libremotebackend_la_LIBADD += $(LIBZMQ_LIBS)
 endif
 
 if UNIT_TESTS
-AM_TESTS_ENVIRONMENT = \
+TESTS_ENVIRONMENT = \
 	BOOST_TEST_LOG_LEVEL=message; \
 	export BOOST_TEST_LOG_LEVEL; \
 	REMOTEBACKEND_ZEROMQ=$(REMOTEBACKEND_ZEROMQ); \