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 --git a/gdb/ChangeLog b/gdb/ChangeLog
index ba2730272dbcde46cb1e7c3bf4e94975496d47ec..43c4753860e1897dabed22cf43c5224679a333ec 100644 (file)
--- 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 d92a256f1ff510ca26c11fba98dacca89f36202a..e011b77414ba108e06561180092da5760739eb0e 100755 (executable)
--- 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 e38604cb65619a6851ef898be8283b816d48bfc5..f658da84e325a7feb4b8d11b260f0f20028bb306 100644 (file)
--- 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