From 61179dec7716975a151c6dae4524ae504d05780e Mon Sep 17 00:00:00 2001 From: Azat Khuzhin Date: Wed, 11 May 2016 16:02:02 +0300 Subject: [PATCH] automake: define serial-tests only if automake have this option P.S. I did try a lot of other ways, but seems that this is the only one that will work. Fixes: automake 1.11 Travis-CI: https://travis-ci.org/azat/libevent/jobs/129398265 --- Makefile.am | 4 ---- configure.ac | 13 ++++++++++++- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/Makefile.am b/Makefile.am index 3457f7cb..f740bf3d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -4,10 +4,6 @@ # # See LICENSE for copying information. -# 'foreign' means that we're not enforcing GNU package rules strictly. -# '1.9' means that we need automake 1.9 or later (and we do). -AUTOMAKE_OPTIONS = foreign 1.9 subdir-objects serial-tests - ACLOCAL_AMFLAGS = -I m4 # This is the "Release" of the Libevent ABI. It takes precedence over diff --git a/configure.ac b/configure.ac index 15cc47cb..334d2968 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,18 @@ AC_PREREQ(2.59) AC_CONFIG_SRCDIR(event.c) AC_CONFIG_MACRO_DIR([m4]) -AM_INIT_AUTOMAKE + +# 'foreign' means that we're not enforcing GNU package rules strictly. +# '1.9' means that we need automake 1.9 or later (and we do). +# serial-tests means that we don't need parallel test harness +AM_INIT_AUTOMAKE(m4_esyscmd([echo foreign 1.9 subdir-objects + case `automake --version | head -n 1` in + *1.9*);; + *1.10*);; + *1.11*);; + *) echo serial-tests;; + esac])) + dnl AM_SILENT_RULES req. automake 1.11. [no] defaults V=1 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_HEADERS(config.h evconfig-private.h:evconfig-private.h.in) -- 2.40.0