summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-30 16:17:41 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-31 15:10:09 +0000
commitb5d96564904e0d7c0361574d76f7dce1847fb4c3 (patch)
tree62954c979fd5509f044f8a1ee12a205e8e93c23c /configure.ac
parent8d7c3206ff2003e8095b8da357ab009011a2b2f1 (diff)
Require Automake 1.12 and force use of the parallel tests driver
This means we can use the newly-recommended AM_TESTS_ENVIRONMENT for the environment (TESTS_ENVIRONMENT is now reserved for the user, like CFLAGS), and LOG_COMPILER for the executable that will wrap the logs. We also no longer need test-wrapper.sh for the tests, because Automake has similar functionality built-in (on a buildbot or whatever, use "make check VERBOSE=1" to cat the logs automatically). Also use subdir-objects, to shut Automake 1.14 up.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 5f54dcc28..f50a15228 100644
--- a/configure.ac
+++ b/configure.ac
@@ -49,7 +49,7 @@ AC_INIT([Telepathy-GLib], [tp_glib_version],
AC_CONFIG_MACRO_DIR([m4])
-AM_INIT_AUTOMAKE([1.11 -Wno-portability])
+AM_INIT_AUTOMAKE([1.12 -Wno-portability subdir-objects parallel-tests])
AC_CONFIG_HEADERS(config.h)
AM_SILENT_RULES