To take into account that Automake 1.13 or later will be used:

  * doc/mpfr.texi, INSTALL: updates related to "make check".
  * configure.ac: require Automake 1.13 since the documentation now
    assumes that 1.13 or later is used (and because previous Automake
    versions are no longer tested); also added AM_PROG_AR to support
    unusual archivers (after a warning from Automake 1.13).
(merged changesets r8546,8572-8573,8611,9375,9380 from the trunk)

git-svn-id: svn://scm.gforge.inria.fr/svn/mpfr/branches/3.1@9434 280ebfd0-de03-0410-8827-d642c229c3f4

3 files changed, 40 insertions, 7 deletions

diff --git a/INSTALL b/INSTALL
index c29dbdfd2..442ff3f94 100644
--- a/INSTALL
+++ b/INSTALL
@@ -72,6 +72,14 @@ MPFR).
 5. To check the built library (runs the test files), type:
      make check
 
+   Note: If any test fails, information about this failure can be found in
+   the tests/test-suite.log file; you should provide this file in your bug
+   reports (in addition to other useful information, as mentioned later).
+   If you want the contents of this file to be automatically output in case
+   of failure, you can set the VERBOSE environment variable to 1 before
+   running "make check", for instance by typing:
+     VERBOSE=1 make check
+
 6. To install it (default "/usr/local" | see "--prefix" option), type:
      make install
 
@@ -438,7 +446,8 @@ mailing-list <mpfr@inria.fr>, indicating the machine and operating system
 used (uname -a), the compiler and version used (gcc -v if you use gcc),
 the configure options used if any (including variables such as CC and
 CFLAGS), the version of GMP and MPFR used, and a description of the
-problem encountered. Please send us also the log of the "configure"
+problem encountered, in particular the tests/test-suite.log file if
+"make check" failed. Please send us also the log of the "configure"
 (config.log).
 
 Note that even if you can build MPFR with a C++ compiler, you can't run
diff --git a/configure.ac b/configure.ac
index de11a1f40..1648b97eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -25,7 +25,11 @@ http://www.gnu.org/licenses/ or write to the Free Software Foundation, Inc.,
 dnl Add check-news when it checks for more than 15 lines
 AC_INIT([MPFR],[3.1.3-dev])
 
-AM_INIT_AUTOMAKE([1.11 no-define dist-bzip2 dist-xz dist-zip])
+dnl Older Automake versions than 1.13 may still be supported, but no longer
+dnl tested, and many things have changed in 1.13. Moreover the INSTALL file
+dnl and MPFR manual assume that MPFR has been built using Automake 1.13+
+dnl (due to parallel tests, introduced by default in Automake 1.13).
+AM_INIT_AUTOMAKE([1.13 no-define dist-bzip2 dist-xz dist-zip])
 AM_MAINTAINER_MODE(enable)
 
 AC_CONFIG_MACRO_DIR([m4])
@@ -42,6 +46,9 @@ if test -n "$CFLAGS" || test -n "$CC" ; then
  user_redefine_cc=yes
 fi
 
+dnl Basic Autoconf macros. At this point, they must not make Autoconf
+dnl choose a compiler because of the CC and CFLAGS setup from gmp.h!
+
 AC_CANONICAL_HOST
 
 AC_PROG_EGREP
@@ -167,6 +174,10 @@ dnl
 dnl ********************************************************************
 dnl Check for CC and CFLAGS in gmp.h
 
+dnl Warning! The following tests must be done before Autoconf selects
+dnl a compiler. This means that some macros such as AC_PROG_CC and
+dnl AM_PROG_AR must be put after the following code.
+
 if test -z "$user_redefine_cc" && test "$cross_compiling" != yes ; then
 
 dnl We need to guess the C preprocessor instead of using AC_PROG_CPP,
@@ -238,6 +249,9 @@ AC_PROG_CC
 AC_PROG_CPP
 AC_LANG(C)
 
+dnl Support unusual archivers.
+AM_PROG_AR
+
 dnl For GCC, _Decimal64 was introduced in GCC 4.3 for some targets
 dnl (note that it is not guaranteed to be available because it may
 dnl be disabled in the GCC build). See:
diff --git a/doc/mpfr.texi b/doc/mpfr.texi
index 0b5b172d9..f372c8f7a 100644
--- a/doc/mpfr.texi
+++ b/doc/mpfr.texi
@@ -384,13 +384,22 @@ for more information, in particular if you get error messages.
 
 This will compile MPFR, and create a library archive file @file{libmpfr.a}.
 On most platforms, a dynamic library will be produced too.
+
 @item
 @samp{make check}
 
-This will make sure MPFR was built correctly.
-If you get error messages, please report this to the MPFR mailing-list
-@samp{mpfr@@inria.fr}.  (@xref{Reporting Bugs}, for
-information on what to include in useful bug reports.)
+This will make sure that MPFR was built correctly.
+If any test fails, information about this failure can be found in the
+@file{tests/test-suite.log} file. If you want the contents of this file to
+be automatically output in case of failure, you can set the @samp{VERBOSE}
+environment variable to 1 before running @samp{make check}, for instance
+by typing:
+
+@samp{VERBOSE=1 make check}
+
+In case of failure, you may want to check whether the problem is already
+known. If not, please report this failure to the MPFR mailing-list
+@samp{mpfr@@inria.fr}. For details, @xref{Reporting Bugs}.
 
 @item
 @samp{make install}
@@ -511,7 +520,8 @@ be extracted using @samp{cc -V} on some machines, or, if you're using GCC,
 @samp{gcc -v}. Also, include the output from @samp{uname -a} and the MPFR
 version (the GMP version may be useful too).
 If you get a failure while running @samp{make} or @samp{make check}, please
-include the @samp{config.log} file in your bug report.
+include the @file{config.log} file in your bug report, and in case of test
+failure, the @file{tests/test-suite.log} file too.
 
 If your bug report is good, we will do our best to help you to get a corrected
 version of the library; if the bug report is poor, we will not do anything