From e4c1483b48c4d3eb6e1692aed8c2e183386d2c0a Mon Sep 17 00:00:00 2001 From: Ben Noordhuis Date: Thu, 8 Aug 2013 22:03:18 +0200 Subject: [PATCH] build: serial-tests was added in automake v1.12 Commit a97685e added a check that tries to ascertain whether the serial-tests option is supported by automake. It assumed that said option was added in automake v1.11 but it turns out that's wrong, it wasn't added until v1.12. Update the check. Of course, none of this would have been necessary if the automake people had simply added a macro that tells you if serial-tests is supported or not. --- configure.ac | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/configure.ac b/configure.ac index f50e63536..6ec673e5b 100644 --- a/configure.ac +++ b/configure.ac @@ -14,9 +14,9 @@ AC_PREREQ(2.57) AC_INIT([libuv], [0.11.5], [https://github.com/joyent/libuv/issues]) -# Use AM_SILENT_RULES as an ad-hoc version check to find out if it's safe -# to use the serial-tests directive. Both were added in automake v0.11. -AM_INIT_AUTOMAKE(m4_ifdef([AM_SILENT_RULES], +# Use AM_PROG_AR as an ad-hoc version check to find out if it's safe +# to use the serial-tests directive. Both were added in automake v0.12. +AM_INIT_AUTOMAKE(m4_ifdef([AM_PROG_AR], [-Wall -Werror foreign subdir-objects serial-tests], [-Wall -Werror foreign subdir-objects])) AC_CONFIG_MACRO_DIR([m4])