diff options
| author | Dan Nicholson <dbn.lists@gmail.com> | 2014-02-08 11:13:46 -0800 |
|---|---|---|
| committer | Dan Nicholson <dbn.lists@gmail.com> | 2014-09-27 16:20:32 -0700 |
| commit | 82316c17b46b4db2a2471a4e8c26e09bbb88d708 (patch) | |
| tree | 3cb3d61bca66843bc2a53aae6225cc26985c7d71 /configure.ac | |
| parent | 29cddacd302bbed5efce60a1574237a5fb00ae53 (diff) | |
| download | pkg-config-82316c17b46b4db2a2471a4e8c26e09bbb88d708.tar.gz | |
Ensure usage of serial test driver in automake
Automake has a nice parallel test driver available since 1.12 which
became the default in 1.13. Unfortunately, it breaks the pkg-config
testsuite, so we need to ensure the serial test driver is used. On 1.12,
we can specify the option 'serial-tests', but this doesn't exist on
1.11. Kludge around this by detecting if the automake version is less
than 1.12 and leaving the option out in that case.
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 16 |
1 files changed, 14 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index 4eeaa82..b807251 100644 --- a/configure.ac +++ b/configure.ac @@ -7,8 +7,20 @@ AC_INIT([pkg-config], AC_CONFIG_HEADERS([config.h]) AC_CONFIG_SRCDIR([main.c]) -dnl Initialize automake and libtool -AM_INIT_AUTOMAKE([1.11]) +dnl Initialize automake. Sadly, we have to kludge around the automake +dnl test driver here. We need to use the serial driver (for now), but +dnl the parallel driver is the default in 1.13. So, we want to specify +dnl the serial driver. Unfortunately, the option to specify that driver +dnl didn't exist until 1.12. +m4_define([automake_version], + [m4_esyscmd([${AUTOMAKE-automake} --version | + awk '/^automake/{print $NF}'])]) +m4_define([automake_serial_tests], + [m4_if(m4_version_compare(automake_version, [1.12]), [-1], + [], [serial-tests])]) +AM_INIT_AUTOMAKE([1.11 ]automake_serial_tests) + +dnl Initialize libtool LT_PREREQ([2.2]) LT_INIT |