Richard W.M. Jones
2015-Nov-04 21:09 UTC
[Libguestfs] [PATCH] build: Remove support for automake < 1.13.
RHEL 6 has automake 1.13.4. Since we have stopped supporting RHEL 5, there is no need for the complex macro to check for older versions of automake that didn't have 'serial_tests'. --- configure.ac | 17 +---------------- 1 file changed, 1 insertion(+), 16 deletions(-) diff --git a/configure.ac b/configure.ac index 88f5568..9fde5c5 100644 --- a/configure.ac +++ b/configure.ac @@ -30,22 +30,7 @@ AC_SUBST([RELEASE_DATE], [2015-11-04]) AC_CONFIG_AUX_DIR([build-aux]) -dnl Initialize automake. automake < 1.12 didn't have serial-tests and -dnl gives an error if it sees this, but for automake >= 1.13 -dnl serial-tests is required so we have to include it. Solution is to -dnl test for the version of automake (by running an external command) -dnl and provide it if necessary. Note we have to do this entirely using -dnl m4 macros since automake queries this macro by running -dnl 'autoconf --trace'. -m4_define([serial_tests], [ - m4_esyscmd([automake --version | head -1 | awk ' - { - split ($NF, version, "."); - if (version[1] == 1 && version[2] >= 12) - print "serial-tests"; - }' - ]) -]) +dnl Initialize automake. AM_INIT_AUTOMAKE(foreign serial_tests subdir-objects) dnl NB: Do not [quote] this parameter. m4_ifndef([AM_SILENT_RULES], [m4_define([AM_SILENT_RULES],[])]) -- 2.5.0
Richard W.M. Jones
2015-Nov-04 21:10 UTC
[Libguestfs] Ignore this (was: Re: [PATCH] build: Remove support for automake < 1.13.)
On Wed, Nov 04, 2015 at 09:09:05PM +0000, Richard W.M. Jones wrote:> RHEL 6 has automake 1.13.4. Since we have stopped supporting RHEL 5, > there is no need for the complex macro to check for older versions of > automake that didn't have 'serial_tests'.Sorry, this commit is complete nonsense! automake in RHEL 6 is 1.11. Please ignore ... Rich. -- Richard Jones, Virtualization Group, Red Hat http://people.redhat.com/~rjones Read my programming and virtualization blog: http://rwmj.wordpress.com virt-df lists disk usage of guests without needing to install any software inside the virtual machine. Supports Linux and Windows. http://people.redhat.com/~rjones/virt-df/