[binutils-gdb] Check for gmp when checking for mpfr

[Tom Tromey]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=da658607ed24bc5a4dcfcfb56b6e1440ccab33d2

commit da658607ed24bc5a4dcfcfb56b6e1440ccab33d2
Author: Tom Tromey <tom@tromey.com>
Date:   Sun Sep 16 09:52:09 2018 -0600

    Check for gmp when checking for mpfr
    
    There was a report on irc that the gdb check for mpfr failed when only
    static libraries are available.  The issue is that mpfr depends on
    gmp, but this is not handled explicitly by gdb.
    
    Ideally upstream would switch to pkg-config.  Or even more ideally, we
    would incorporate pkg-config into the compiler and not mess with any
    of this.
    
    Meanwhile, this changes gdb's configure to add gmp to the link line
    when checking for mpfr.
    
    gdb/ChangeLog
    2018-09-17  Tom Tromey  <tom@tromey.com>
    
    	* configure: Rebuild.
    	* configure.ac: Use gmp as a library dependency when checking for
    	mpfr.

Diff:
---
 gdb/ChangeLog    | 6 ++++++
 gdb/configure    | 2 +-
 gdb/configure.ac | 2 +-
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index ba27302..43c4753 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,9 @@
+2018-09-17  Tom Tromey  <tom@tromey.com>
+
+	* configure: Rebuild.
+	* configure.ac: Use gmp as a library dependency when checking for
+	mpfr.
+
 2018-09-17  Pedro Alves  <palves@redhat.com>
 
 	* python/py-inferior.c (find_inferior_object): Delete.
diff --git a/gdb/configure b/gdb/configure
index d92a256..e011b77 100755
--- a/gdb/configure
+++ b/gdb/configure
@@ -9837,7 +9837,7 @@ fi
   rpathdirs=
   ltrpathdirs=
   names_already_handled=
-  names_next_round='mpfr '
+  names_next_round='mpfr gmp'
   while test -n "$names_next_round"; do
     names_this_round="$names_next_round"
     names_next_round=
diff --git a/gdb/configure.ac b/gdb/configure.ac
index e38604c..f658da8 100644
--- a/gdb/configure.ac
+++ b/gdb/configure.ac
@@ -682,7 +682,7 @@ if test "${with_mpfr}" = no; then
   AC_MSG_WARN([MPFR support disabled; some features may be unavailable.])
   HAVE_LIBMPFR=no
 else
-  AC_LIB_HAVE_LINKFLAGS([mpfr], [], [#include <mpfr.h>],
+  AC_LIB_HAVE_LINKFLAGS([mpfr], [gmp], [#include <mpfr.h>],
 			[mpfr_exp_t exp; mpfr_t x;
 			 mpfr_frexp (&exp, x, x, MPFR_RNDN);])
   if test "$HAVE_LIBMPFR" != yes; then