diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-01-28 22:28:00 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-28 22:28:42 +0100 |
| commit | ac28db6db12dbb7c43e3e2207d9607989d65bc6b (patch) | |
| tree | 7f88cfc6c613223b7a8b9456c2b5d06a51ec1da0 | |
| parent | aac01de63dfb44a442df8ae6920ee431ba81780e (diff) | |
| download | guile-ac28db6db12dbb7c43e3e2207d9607989d65bc6b.tar.gz | |
build: Allow use of Automake 1.13.
Fixes <http://bugs.gnu.org/13558>.
Reported by DNS <dns@rbose.org>.
* configure.ac: Use the `serial-tests' Automake option to cope with
Automake 1.13, which uses `parallel-tests' by default.
| -rw-r--r-- | .gitignore | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index 4ff958e28..98ca125e7 100644 --- a/.gitignore +++ b/.gitignore @@ -150,3 +150,5 @@ INSTALL /lib/dirent.h /lib/langinfo.h /lib/wctype.h +/build-aux/ar-lib +/build-aux/test-driver diff --git a/configure.ac b/configure.ac index 783af3e47..04c505e56 100644 --- a/configure.ac +++ b/configure.ac @@ -5,7 +5,7 @@ dnl define(GUILE_CONFIGURE_COPYRIGHT,[[ Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, - 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc. + 2007, 2008, 2009, 2010, 2011, 2012, 2013 Free Software Foundation, Inc. This file is part of GUILE @@ -36,7 +36,10 @@ AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(GUILE-VERSION) dnl `AM_PROG_AR' was introduced in Automake 1.11.2. -AM_INIT_AUTOMAKE([1.11.2 gnu no-define -Wall -Wno-override color-tests dist-xz]) +dnl Use `serial-tests' so the output `check-guile' is not hidden +dnl (`parallel-tests' is the default in Automake 1.13.) +AM_INIT_AUTOMAKE([1.11.2 gnu no-define -Wall -Wno-override \ + serial-tests color-tests dist-xz]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])], [AC_SUBST([AM_DEFAULT_VERBOSITY],1)]) AC_COPYRIGHT(GUILE_CONFIGURE_COPYRIGHT) |