From 79bc1d4d3701380a9383e99870936f312c2600ef Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Thu, 9 Apr 2009 15:54:10 +0000 Subject: [PATCH] 2009-04-09 Kaveh R. Ghazi * configure.ac: Bump minimum GMP/MPFR versions to 4.2 and 2.3.1. * configure: Regenerate. --- ChangeLog | 5 +++++ configure | 8 ++++---- configure.ac | 8 ++++---- 3 files changed, 13 insertions(+), 8 deletions(-) diff --git a/ChangeLog b/ChangeLog index a78830557..7aba867eb 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-04-09 Kaveh R. Ghazi + + * configure.ac: Bump minimum GMP/MPFR versions to 4.2 and 2.3.1. + * configure: Regenerate. + 2009-04-09 H.J. Lu PR gas/10039 diff --git a/configure b/configure index 87b0187a4..bfb1d6b81 100755 --- a/configure +++ b/configure @@ -4622,7 +4622,7 @@ int main () { - #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 1) + #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 2) choke me #endif @@ -4680,7 +4680,7 @@ int main () { - #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0) + #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1) choke me #endif mpfr_t n; @@ -4786,7 +4786,7 @@ rm -f conftest.err conftest.$ac_objext \ CFLAGS="$saved_CFLAGS" if test x$have_gmp != xyes; then - { { echo "$as_me:$LINENO: error: Building GCC requires GMP 4.1+ and MPFR 2.3.2+. + { { echo "$as_me:$LINENO: error: Building GCC requires GMP 4.2+ and MPFR 2.3.2+. Try the --with-gmp and/or --with-mpfr options to specify their locations. Copies of these libraries' source code can be found at their respective hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/. @@ -4794,7 +4794,7 @@ See also http://gcc.gnu.org/install/prerequisites.html for additional info. If you obtained GMP and/or MPFR from a vendor distribution package, make sure that you have installed both the libraries and the header files. They may be located in separate packages." >&5 -echo "$as_me: error: Building GCC requires GMP 4.1+ and MPFR 2.3.2+. +echo "$as_me: error: Building GCC requires GMP 4.2+ and MPFR 2.3.2+. Try the --with-gmp and/or --with-mpfr options to specify their locations. Copies of these libraries' source code can be found at their respective hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/. diff --git a/configure.ac b/configure.ac index 04ccfd50b..fd9612264 100644 --- a/configure.ac +++ b/configure.ac @@ -1264,7 +1264,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then # Check GMP actually works AC_MSG_CHECKING([for correct version of gmp.h]) AC_TRY_COMPILE([#include "gmp.h"],[ - #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 1) + #if __GNU_MP_VERSION < 4 || (__GNU_MP_VERSION == 4 && __GNU_MP_VERSION_MINOR < 2) choke me #endif ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); have_gmp=no]) @@ -1272,11 +1272,11 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then if test x"$have_gmp" = xyes; then saved_LIBS="$LIBS" LIBS="$LIBS $gmplibs" - dnl MPFR 2.3.0 is acceptable, but MPFR 2.3.2 is better. + dnl MPFR 2.3.1 is acceptable, but MPFR 2.3.2 is better. AC_MSG_CHECKING([for correct version of mpfr.h]) AC_TRY_LINK([#include #include ],[ - #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,0) + #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1) choke me #endif mpfr_t n; @@ -1300,7 +1300,7 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then CFLAGS="$saved_CFLAGS" if test x$have_gmp != xyes; then - AC_MSG_ERROR([Building GCC requires GMP 4.1+ and MPFR 2.3.2+. + AC_MSG_ERROR([Building GCC requires GMP 4.2+ and MPFR 2.3.2+. Try the --with-gmp and/or --with-mpfr options to specify their locations. Copies of these libraries' source code can be found at their respective hosting sites as well as at ftp://gcc.gnu.org/pub/gcc/infrastructure/. -- 2.11.4.GIT