aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLasse Collin <lasse.collin@tukaani.org>2013-06-26 12:17:00 +0300
committerLasse Collin <lasse.collin@tukaani.org>2013-06-26 12:17:13 +0300
commitf39ddd88f3222219ada88998cf30abfdd3e0e96c (patch)
tree0d810de99f34631771221a2b050f428e8f4cdb13
parentxz: Validate Uncompressed Size from Block Header in list.c. (diff)
downloadxz-f39ddd88f3222219ada88998cf30abfdd3e0e96c.tar.xz
Build: Require Automake 1.12 and use serial-tests option.
It should actually still work with Automake 1.10 if the serial-tests option is removed. Automake 1.13 started using parallel tests by default and the option to get the old behavior isn't supported before 1.12. At least for now, parallel tests don't improve anything in XZ Utils but they hide the progress output from test_compress.sh.
-rw-r--r--configure.ac4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index d80ec6fe..305c858d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -416,7 +416,9 @@ fi
echo
echo "Initializing Automake:"
-AM_INIT_AUTOMAKE([1.10 foreign tar-v7 filename-length-max=99])
+# Automake 1.10 should still be enough but you need to omit serial-tests.
+dnl AM_INIT_AUTOMAKE([1.10 foreign tar-v7 filename-length-max=99])
+AM_INIT_AUTOMAKE([1.12 foreign tar-v7 filename-length-max=99 serial-tests])
AC_PROG_LN_S
AC_PROG_CC_C99