Make parallel test harness work with automake-1.11

diff --git a/configure.ac b/configure.ac
index cde58a67d7ac82dcb8d0d7e6e2ee39157f4b229a..7de39f7d24f39a891073801d0e211aef19cdab66 100644 (file)
--- 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 4aa0a548bb1682976c4c92c7292c5f1613cab486..34f046847150ff8566cc0a32d011d4e228e5aecf 100644 (file)
--- 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); \