28 files changed, 376 insertions, 198 deletions
diff --git a/Makefile.in b/Makefile.in
index 848eedf92..090388374 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -111,7 +111,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -138,6 +137,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/aclocal.m4 b/aclocal.m4
index ad115a5e2..ea4dce28b 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -8477,3 +8477,128 @@ case "x$am_cv_prog_cc_stdc" in
 esac
 ])
 
+
+AC_DEFUN(AC_MY_LIBS,
+[
+if ` test "$1" `
+then  
+  AC_MSG_CHECKING(gmp library)
+	if  test -r "$1/lib$2.a"
+	then
+	  LDADD="$LDADD $1/lib$2.a"
+	else
+	   AC_MSG_ERROR($2 not found)
+	fi
+  AC_MSG_RESULT(yes)
+else
+  AC_CHECK_LIB($2, main, , AC_MSG_ERROR($2 not found))
+fi
+]
+)
+
+AC_DEFUN(AC_MY_HEADERS, 
+[
+if  test "$1" 
+then  
+  AC_CHECK_HEADER($1/$2, INCLUDES="$INCLUDES -I$1",AC_MSG_ERROR(echo $2 not found in $1)) 
+else
+  AC_CHECK_HEADER($2,, 	  AC_MSG_ERROR($2 not found))
+fi
+])
+
+AC_DEFUN(AC_CHECK_OS, 
+[
+	AC_MSG_CHECKING(OS type)
+	OS_TYPE=`uname -a | awk '{print $ 1}' `
+	AC_MSG_RESULT($OS_TYPE)
+])
+
+AC_DEFUN(AC_CHECK_MACHTYPE,
+[
+	AC_MSG_CHECKING(Mach type)
+	MACHTYPE=`uname -m`
+	AC_MSG_RESULT($MACHTYPE)
+])
+
+dnl ------------------------------------------------------------
+
+AC_DEFUN(MPFR_CONFIGS,
+[
+AC_CHECK_HEADERS(fpu_control.h)
+
+dnl Check for fesetround
+AC_MSG_CHECKING(for fesetround)
+saved_LIBS="$LIBS"
+LIBS="$LIBS $LM9X"
+AC_TRY_LINK([#include <fenv.h>], [fesetround(FE_TONEAREST);],
+  [AC_MSG_RESULT(yes)
+   AC_DEFINE(MPFR_HAVE_FESETROUND,1,[Define if you have the `fesetround' function via the <fenv.h> header file.])],
+  [AC_MSG_RESULT(no)
+   LIBS="$saved_LIBS"]
+)
+
+dnl Check random functions
+AC_CHECK_FUNCS(lrand48)
+
+dnl Check whether 0/0, 1/0, -1/0, sqrt(-1) are valid expressions
+AC_MSG_CHECKING(for valid NaN)
+AC_TRY_RUN([
+#include <math.h>
+int main()
+{
+  double x = (0.0/0.0) + sqrt(-1.0);
+  return x == 1.0/0.0;
+}
+],
+  [AC_MSG_RESULT(yes)
+   AC_DEFINE(HAVE_INFS,1,[Define if 0/0, 1/0, -1/0 and sqrt(-1) work to generate NaN/infinities.])],
+  AC_MSG_RESULT(no),
+  AC_MSG_RESULT(no)
+)
+
+dnl Check for gcc float-conversion bug; if need be, -ffloat-store is used to
+dnl force the conversion to the destination type when a value is stored to
+dnl a variable (see ISO C99 standard 5.1.2.3#13, 6.3.1.5#2, 6.3.1.8#2). This
+dnl is important concerning the exponent range. Note that this doesn't solve
+dnl the double-rounding problem (x86 processors still have to be set to the
+dnl IEEE-754 compatible rounding mode).
+if test -n "$GCC"; then
+  AC_MSG_CHECKING(for gcc float-conversion bug)
+  AC_TRY_RUN([
+int main()
+{
+  double x = 0.5;
+  int i;
+  for (i = 1; i <= 11; i++)
+    x *= x;
+  return x == 0;
+}
+  ],
+    [AC_MSG_RESULT([yes, use -ffloat-store])
+     CFLAGS="$CFLAGS -ffloat-store"],
+    AC_MSG_RESULT(no),
+    [AC_MSG_RESULT([can't test, use -ffloat-store])
+     CFLAGS="$CFLAGS -ffloat-store"]
+  )
+fi
+
+dnl Check if denormalized numbers are supported
+AC_MSG_CHECKING(for denormalized numbers)
+AC_TRY_RUN([
+#include <math.h>
+#include <stdio.h>
+int main()
+{
+  double x = 2.22507385850720138309e-308;
+  fprintf (stderr, "%e\n", x / 2.0);
+  return 2.0 * (x / 2.0) != x;
+}
+],
+  [AC_MSG_RESULT(yes)
+   AC_DEFINE(HAVE_DENORMS,1,[Define if denormalized floats work.])],
+  AC_MSG_RESULT(no),
+  AC_MSG_RESULT(no)
+)
+
+])
+
diff --git a/config.in b/config.in
index d0841b2bf..2321c7a3b 100644
--- a/config.in
+++ b/config.in
@@ -246,9 +246,6 @@ MA 02111-1307, USA. */
 /* Define if you have the <fcntl.h> header file. */
 #undef HAVE_FCNTL_H
 
-/* Define if `fesetround' and <fenv.h> exist. */
-#undef HAVE_FESETROUND
-
 /* Define if you have the <fpu_control.h> header file. */
 #undef HAVE_FPU_CONTROL_H
 
@@ -261,7 +258,7 @@ MA 02111-1307, USA. */
 /* Define if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
-/* Define if 0/0, 1/0, -1/0 and sqrt(-1) work to generate infinities */
+/* Define if 0/0, 1/0, -1/0 and sqrt(-1) work to generate NaN/infinities. */
 #undef HAVE_INFS
 
 /* Define if the system has the type `intmax_t'. */
@@ -420,6 +417,10 @@ MA 02111-1307, USA. */
 /* Assembler local label prefix */
 #undef LSYM_PREFIX
 
+/* Define if you have the `fesetround' function via the <fenv.h> header file.
+   */
+#undef MPFR_HAVE_FESETROUND
+
 /* Name of package */
 #undef PACKAGE
 
diff --git a/configure b/configure
index 84af9a0fd..c32343ce3 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.410 .
+# From configure.in Revision: 1.413 .
 #
 #
 #
@@ -20520,94 +20520,28 @@ done
 # Configs for mpfr.
 #
 if test $enable_mpfr = yes; then
-  # Denorm support is necessary for mpfr_set_d and mpfr_get_d, and for the
-  # various test programs.  On alpha denorms cause SIGFPE by default.
-  # -mieee-with-inexact is for gcc, -ieee_with_inexact is for DEC C.
-  #
-  CFLAGS_IEEE_WITH_INEXACT=
-  case $host in
-    alpha*-*-*)
-      for i in -mieee-with-inexact -ieee_with_inexact; do
-        echo "$as_me:20531: checking compiler $CC $CFLAGS $i" >&5
-echo $ECHO_N "checking compiler $CC $CFLAGS $i... $ECHO_C" >&6
-cat >conftest.c <<EOF
-
-/* The following provokes an internal error from gcc 2.95.2 -mpowerpc64
-   (without -maix64), hence detecting an unusable compiler */
-void *g() { return (void *) 0; }
-void *f() { return g(); }
-
-/* The following provokes an invalid instruction syntax from i386 gcc
-   -march=pentiumpro on Solaris 2.8.  The native sun assembler
-   requires a non-standard syntax for cmov which gcc (as of 2.95.2 at
-   least) doesn't know.  */
-int n;
-int cmov () { return (n >= 0 ? n : 0); }
-
-/* The following provokes a linker invocation problem with gcc 3.0.3
-   on AIX 4.3 under "-maix64 -mpowerpc64 -mcpu=630".  The -mcpu=630
-   option causes gcc to incorrectly select the 32-bit libgcc.a, not
-   the 64-bit one, and consequently it misses out on the __fixunsdfdi
-   helper (double -> uint64 conversion).  */
-double d;
-unsigned long gcc303 () { return (unsigned long) d; }
-
-int main () { return 0; }
-EOF
-gmp_prog_cc_works=no
-gmp_compile="$CC $CFLAGS $i conftest.c >&5"
-if { (eval echo "$as_me:20559: \"$gmp_compile\"") >&5
-  (eval $gmp_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:20562: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-  if test "$cross_compiling" = no; then
-    if { ac_try='./a.out || ./a.exe || ./conftest'
-  { (eval echo "$as_me:20566: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:20569: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-      gmp_prog_cc_works=yes
-    fi
-  else
-    gmp_prog_cc_works=yes
-  fi
-fi
-rm -f conftest* a.out a.exe
-echo "$as_me:20578: result: $gmp_prog_cc_works" >&5
-echo "${ECHO_T}$gmp_prog_cc_works" >&6
-if test $gmp_prog_cc_works = yes; then
-  CFLAGS_IEEE_WITH_INEXACT=$i
-          break
-else
-  :
-fi
-
-      done
-      ;;
-  esac
+  gmp_save_CFLAGS=$CFLAGS
 
 for ac_header in fpu_control.h
 do
 as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-echo "$as_me:20594: checking for $ac_header" >&5
+echo "$as_me:20528: checking for $ac_header" >&5
 echo $ECHO_N "checking for $ac_header... $ECHO_C" >&6
 if eval "test \"\${$as_ac_Header+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20600 "configure"
+#line 20534 "configure"
 #include "confdefs.h"
 #include <$ac_header>
 _ACEOF
-if { (eval echo "$as_me:20604: \"$ac_cpp conftest.$ac_ext\"") >&5
+if { (eval echo "$as_me:20538: \"$ac_cpp conftest.$ac_ext\"") >&5
   (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
   ac_status=$?
   egrep -v '^ *\+' conftest.er1 >conftest.err
   rm -f conftest.er1
   cat conftest.err >&5
-  echo "$as_me:20610: \$? = $ac_status" >&5
+  echo "$as_me:20544: \$? = $ac_status" >&5
   (exit $ac_status); } >/dev/null; then
   if test -s conftest.err; then
     ac_cpp_err=$ac_c_preproc_warn_flag
@@ -20626,7 +20560,7 @@ else
 fi
 rm -f conftest.err conftest.$ac_ext
 fi
-echo "$as_me:20629: result: `eval echo '${'$as_ac_Header'}'`" >&5
+echo "$as_me:20563: result: `eval echo '${'$as_ac_Header'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
 if test `eval echo '${'$as_ac_Header'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -20636,12 +20570,12 @@ EOF
 fi
 done
 
-echo "$as_me:20639: checking for fesetround" >&5
+echo "$as_me:20573: checking for fesetround" >&5
 echo $ECHO_N "checking for fesetround... $ECHO_C" >&6
 saved_LIBS="$LIBS"
 LIBS="$LIBS $LM9X"
 cat >conftest.$ac_ext <<_ACEOF
-#line 20644 "configure"
+#line 20578 "configure"
 #include "confdefs.h"
 #include <fenv.h>
 int
@@ -20653,28 +20587,28 @@ fesetround(FE_TONEAREST);
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20656: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20590: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20659: \$? = $ac_status" >&5
+  echo "$as_me:20593: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20662: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20596: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20665: \$? = $ac_status" >&5
+  echo "$as_me:20599: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20667: result: yes" >&5
+  echo "$as_me:20601: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
-#define HAVE_FESETROUND 1
+#define MPFR_HAVE_FESETROUND 1
 EOF
 
 else
   echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20677: result: no" >&5
+echo "$as_me:20611: result: no" >&5
 echo "${ECHO_T}no" >&6
    LIBS="$saved_LIBS"
 
@@ -20684,13 +20618,13 @@ rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 for ac_func in lrand48
 do
 as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:20687: checking for $ac_func" >&5
+echo "$as_me:20621: checking for $ac_func" >&5
 echo $ECHO_N "checking for $ac_func... $ECHO_C" >&6
 if eval "test \"\${$as_ac_var+set}\" = set"; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20693 "configure"
+#line 20627 "configure"
 #include "confdefs.h"
 /* System header to define __stub macros and hopefully few prototypes,
     which can conflict with char $ac_func (); below.  */
@@ -20721,16 +20655,16 @@ f = $ac_func;
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:20724: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20658: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20727: \$? = $ac_status" >&5
+  echo "$as_me:20661: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:20730: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20664: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20733: \$? = $ac_status" >&5
+  echo "$as_me:20667: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   eval "$as_ac_var=yes"
 else
@@ -20740,7 +20674,7 @@ eval "$as_ac_var=no"
 fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 fi
-echo "$as_me:20743: result: `eval echo '${'$as_ac_var'}'`" >&5
+echo "$as_me:20677: result: `eval echo '${'$as_ac_var'}'`" >&5
 echo "${ECHO_T}`eval echo '${'$as_ac_var'}'`" >&6
 if test `eval echo '${'$as_ac_var'}'` = yes; then
   cat >>confdefs.h <<EOF
@@ -20750,15 +20684,15 @@ EOF
 fi
 done
 
-echo "$as_me:20753: checking for valid NaN" >&5
+echo "$as_me:20687: checking for valid NaN" >&5
 echo $ECHO_N "checking for valid NaN... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  echo "$as_me:20756: result: no" >&5
+  echo "$as_me:20690: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20761 "configure"
+#line 20695 "configure"
 #include "confdefs.h"
 
 #include <math.h>
@@ -20770,17 +20704,17 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20773: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20707: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20776: \$? = $ac_status" >&5
+  echo "$as_me:20710: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20778: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20712: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20781: \$? = $ac_status" >&5
+  echo "$as_me:20715: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20783: result: yes" >&5
+  echo "$as_me:20717: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -20791,21 +20725,69 @@ else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20794: result: no" >&5
+echo "$as_me:20728: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
-echo "$as_me:20800: checking for denormalized numbers" >&5
+if test -n "$GCC"; then
+  echo "$as_me:20735: checking for gcc float-conversion bug" >&5
+echo $ECHO_N "checking for gcc float-conversion bug... $ECHO_C" >&6
+  if test "$cross_compiling" = yes; then
+  echo "$as_me:20738: result: can't test, use -ffloat-store" >&5
+echo "${ECHO_T}can't test, use -ffloat-store" >&6
+     CFLAGS="$CFLAGS -ffloat-store"
+
+else
+  cat >conftest.$ac_ext <<_ACEOF
+#line 20744 "configure"
+#include "confdefs.h"
+
+int main()
+{
+  double x = 0.5;
+  int i;
+  for (i = 1; i <= 11; i++)
+    x *= x;
+  return x == 0;
+}
+
+_ACEOF
+rm -f conftest$ac_exeext
+if { (eval echo "$as_me:20758: \"$ac_link\"") >&5
+  (eval $ac_link) 2>&5
+  ac_status=$?
+  echo "$as_me:20761: \$? = $ac_status" >&5
+  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
+  { (eval echo "$as_me:20763: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:20766: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+  echo "$as_me:20768: result: yes, use -ffloat-store" >&5
+echo "${ECHO_T}yes, use -ffloat-store" >&6
+     CFLAGS="$CFLAGS -ffloat-store"
+else
+  echo "$as_me: program exited with status $ac_status" >&5
+echo "$as_me: failed program was:" >&5
+cat conftest.$ac_ext >&5
+echo "$as_me:20775: result: no" >&5
+echo "${ECHO_T}no" >&6
+fi
+rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
+fi
+fi
+
+echo "$as_me:20782: checking for denormalized numbers" >&5
 echo $ECHO_N "checking for denormalized numbers... $ECHO_C" >&6
 if test "$cross_compiling" = yes; then
-  echo "$as_me:20803: result: no" >&5
+  echo "$as_me:20785: result: no" >&5
 echo "${ECHO_T}no" >&6
 
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20808 "configure"
+#line 20790 "configure"
 #include "confdefs.h"
 
 #include <math.h>
@@ -20819,17 +20801,17 @@ int main()
 
 _ACEOF
 rm -f conftest$ac_exeext
-if { (eval echo "$as_me:20822: \"$ac_link\"") >&5
+if { (eval echo "$as_me:20804: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:20825: \$? = $ac_status" >&5
+  echo "$as_me:20807: \$? = $ac_status" >&5
   (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:20827: \"$ac_try\"") >&5
+  { (eval echo "$as_me:20809: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20830: \$? = $ac_status" >&5
+  echo "$as_me:20812: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
-  echo "$as_me:20832: result: yes" >&5
+  echo "$as_me:20814: result: yes" >&5
 echo "${ECHO_T}yes" >&6
 
 cat >>confdefs.h <<\EOF
@@ -20840,12 +20822,82 @@ else
   echo "$as_me: program exited with status $ac_status" >&5
 echo "$as_me: failed program was:" >&5
 cat conftest.$ac_ext >&5
-echo "$as_me:20843: result: no" >&5
+echo "$as_me:20825: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 rm -f core core.* *.core conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
 fi
 
+  MPFR_CFLAGS=$CFLAGS
+
+  CFLAGS=$gmp_save_CFLAGS
+
+  # Denorm support is necessary for mpfr_set_d and mpfr_get_d, and for the
+  # various test programs.  On alpha denorms cause SIGFPE by default.
+  # -mieee-with-inexact is for gcc, -ieee_with_inexact is for DEC C.
+  #
+  case $host in
+    alpha*-*-*)
+      for i in -mieee-with-inexact -ieee_with_inexact; do
+        echo "$as_me:20842: checking compiler $CC $MPFR_CFLAGS $i" >&5
+echo $ECHO_N "checking compiler $CC $MPFR_CFLAGS $i... $ECHO_C" >&6
+cat >conftest.c <<EOF
+
+/* The following provokes an internal error from gcc 2.95.2 -mpowerpc64
+   (without -maix64), hence detecting an unusable compiler */
+void *g() { return (void *) 0; }
+void *f() { return g(); }
+
+/* The following provokes an invalid instruction syntax from i386 gcc
+   -march=pentiumpro on Solaris 2.8.  The native sun assembler
+   requires a non-standard syntax for cmov which gcc (as of 2.95.2 at
+   least) doesn't know.  */
+int n;
+int cmov () { return (n >= 0 ? n : 0); }
+
+/* The following provokes a linker invocation problem with gcc 3.0.3
+   on AIX 4.3 under "-maix64 -mpowerpc64 -mcpu=630".  The -mcpu=630
+   option causes gcc to incorrectly select the 32-bit libgcc.a, not
+   the 64-bit one, and consequently it misses out on the __fixunsdfdi
+   helper (double -> uint64 conversion).  */
+double d;
+unsigned long gcc303 () { return (unsigned long) d; }
+
+int main () { return 0; }
+EOF
+gmp_prog_cc_works=no
+gmp_compile="$CC $MPFR_CFLAGS $i conftest.c >&5"
+if { (eval echo "$as_me:20870: \"$gmp_compile\"") >&5
+  (eval $gmp_compile) 2>&5
+  ac_status=$?
+  echo "$as_me:20873: \$? = $ac_status" >&5
+  (exit $ac_status); }; then
+  if test "$cross_compiling" = no; then
+    if { ac_try='./a.out || ./a.exe || ./conftest'
+  { (eval echo "$as_me:20877: \"$ac_try\"") >&5
+  (eval $ac_try) 2>&5
+  ac_status=$?
+  echo "$as_me:20880: \$? = $ac_status" >&5
+  (exit $ac_status); }; }; then
+      gmp_prog_cc_works=yes
+    fi
+  else
+    gmp_prog_cc_works=yes
+  fi
+fi
+rm -f conftest* a.out a.exe
+echo "$as_me:20889: result: $gmp_prog_cc_works" >&5
+echo "${ECHO_T}$gmp_prog_cc_works" >&6
+if test $gmp_prog_cc_works = yes; then
+  MPFR_CFLAGS="$MPFR_CFLAGS $i"
+          break
+else
+  :
+fi
+
+      done
+      ;;
+  esac
 fi
 
 # A recompiled sqr_basecase for use in the tune program, if necessary.
@@ -20933,13 +20985,13 @@ yes) HAVE_SYS_RESOURCE_H_01=1
 no)  HAVE_SYS_RESOURCE_H_01=0 ;;
 esac
 
-echo "$as_me:20936: checking for stack_t" >&5
+echo "$as_me:20988: checking for stack_t" >&5
 echo $ECHO_N "checking for stack_t... $ECHO_C" >&6
 if test "${ac_cv_type_stack_t+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
   cat >conftest.$ac_ext <<_ACEOF
-#line 20942 "configure"
+#line 20994 "configure"
 #include "confdefs.h"
 #include <signal.h>
 
@@ -20955,16 +21007,16 @@ if (sizeof (stack_t))
 }
 _ACEOF
 rm -f conftest.$ac_objext
-if { (eval echo "$as_me:20958: \"$ac_compile\"") >&5
+if { (eval echo "$as_me:21010: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
-  echo "$as_me:20961: \$? = $ac_status" >&5
+  echo "$as_me:21013: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:20964: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21016: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:20967: \$? = $ac_status" >&5
+  echo "$as_me:21019: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_type_stack_t=yes
 else
@@ -20974,7 +21026,7 @@ ac_cv_type_stack_t=no
 fi
 rm -f conftest.$ac_objext conftest.$ac_ext
 fi
-echo "$as_me:20977: result: $ac_cv_type_stack_t" >&5
+echo "$as_me:21029: result: $ac_cv_type_stack_t" >&5
 echo "${ECHO_T}$ac_cv_type_stack_t" >&6
 if test $ac_cv_type_stack_t = yes; then
 
@@ -20997,7 +21049,7 @@ ac_config_files="$ac_config_files demos/calc/calc-config.h:demos/calc/calc-confi
 
 use_readline=$with_readline
 if test $with_readline = detect; then
-  echo "$as_me:21000: checking for readline in -lreadline" >&5
+  echo "$as_me:21052: checking for readline in -lreadline" >&5
 echo $ECHO_N "checking for readline in -lreadline... $ECHO_C" >&6
 if test "${ac_cv_lib_readline_readline+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21005,7 +21057,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lreadline  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21008 "configure"
+#line 21060 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21024,16 +21076,16 @@ readline ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21027: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21079: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21030: \$? = $ac_status" >&5
+  echo "$as_me:21082: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21033: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21085: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21036: \$? = $ac_status" >&5
+  echo "$as_me:21088: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_readline_readline=yes
 else
@@ -21044,7 +21096,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21047: result: $ac_cv_lib_readline_readline" >&5
+echo "$as_me:21099: result: $ac_cv_lib_readline_readline" >&5
 echo "${ECHO_T}$ac_cv_lib_readline_readline" >&6
 if test $ac_cv_lib_readline_readline = yes; then
   use_readline=yes
@@ -21063,7 +21115,7 @@ for ac_prog in 'bison -y' byacc
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:21066: checking for $ac_word" >&5
+echo "$as_me:21118: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_YACC+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21078,7 +21130,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_YACC="$ac_prog"
-echo "$as_me:21081: found $ac_dir/$ac_word" >&5
+echo "$as_me:21133: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21086,10 +21138,10 @@ fi
 fi
 YACC=$ac_cv_prog_YACC
 if test -n "$YACC"; then
-  echo "$as_me:21089: result: $YACC" >&5
+  echo "$as_me:21141: result: $YACC" >&5
 echo "${ECHO_T}$YACC" >&6
 else
-  echo "$as_me:21092: result: no" >&5
+  echo "$as_me:21144: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21101,7 +21153,7 @@ for ac_prog in flex lex
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
-echo "$as_me:21104: checking for $ac_word" >&5
+echo "$as_me:21156: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_prog_LEX+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21116,7 +21168,7 @@ for ac_dir in $ac_dummy; do
   test -z "$ac_dir" && ac_dir=.
   $as_executable_p "$ac_dir/$ac_word" || continue
 ac_cv_prog_LEX="$ac_prog"
-echo "$as_me:21119: found $ac_dir/$ac_word" >&5
+echo "$as_me:21171: found $ac_dir/$ac_word" >&5
 break
 done
 
@@ -21124,10 +21176,10 @@ fi
 fi
 LEX=$ac_cv_prog_LEX
 if test -n "$LEX"; then
-  echo "$as_me:21127: result: $LEX" >&5
+  echo "$as_me:21179: result: $LEX" >&5
 echo "${ECHO_T}$LEX" >&6
 else
-  echo "$as_me:21130: result: no" >&5
+  echo "$as_me:21182: result: no" >&5
 echo "${ECHO_T}no" >&6
 fi
 
@@ -21137,7 +21189,7 @@ test -n "$LEX" || LEX=":"
 
 if test -z "$LEXLIB"
 then
-  echo "$as_me:21140: checking for yywrap in -lfl" >&5
+  echo "$as_me:21192: checking for yywrap in -lfl" >&5
 echo $ECHO_N "checking for yywrap in -lfl... $ECHO_C" >&6
 if test "${ac_cv_lib_fl_yywrap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21145,7 +21197,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-lfl  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21148 "configure"
+#line 21200 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21164,16 +21216,16 @@ yywrap ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21167: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21219: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21170: \$? = $ac_status" >&5
+  echo "$as_me:21222: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21173: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21225: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21176: \$? = $ac_status" >&5
+  echo "$as_me:21228: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_fl_yywrap=yes
 else
@@ -21184,12 +21236,12 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21187: result: $ac_cv_lib_fl_yywrap" >&5
+echo "$as_me:21239: result: $ac_cv_lib_fl_yywrap" >&5
 echo "${ECHO_T}$ac_cv_lib_fl_yywrap" >&6
 if test $ac_cv_lib_fl_yywrap = yes; then
   LEXLIB="-lfl"
 else
-  echo "$as_me:21192: checking for yywrap in -ll" >&5
+  echo "$as_me:21244: checking for yywrap in -ll" >&5
 echo $ECHO_N "checking for yywrap in -ll... $ECHO_C" >&6
 if test "${ac_cv_lib_l_yywrap+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21197,7 +21249,7 @@ else
   ac_check_lib_save_LIBS=$LIBS
 LIBS="-ll  $LIBS"
 cat >conftest.$ac_ext <<_ACEOF
-#line 21200 "configure"
+#line 21252 "configure"
 #include "confdefs.h"
 
 /* Override any gcc2 internal prototype to avoid an error.  */
@@ -21216,16 +21268,16 @@ yywrap ();
 }
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21219: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21271: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21222: \$? = $ac_status" >&5
+  echo "$as_me:21274: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21225: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21277: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21228: \$? = $ac_status" >&5
+  echo "$as_me:21280: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_lib_l_yywrap=yes
 else
@@ -21236,7 +21288,7 @@ fi
 rm -f conftest.$ac_objext conftest$ac_exeext conftest.$ac_ext
 LIBS=$ac_check_lib_save_LIBS
 fi
-echo "$as_me:21239: result: $ac_cv_lib_l_yywrap" >&5
+echo "$as_me:21291: result: $ac_cv_lib_l_yywrap" >&5
 echo "${ECHO_T}$ac_cv_lib_l_yywrap" >&6
 if test $ac_cv_lib_l_yywrap = yes; then
   LEXLIB="-ll"
@@ -21247,7 +21299,7 @@ fi
 fi
 
 if test "x$LEX" != "x:"; then
-  echo "$as_me:21250: checking lex output file root" >&5
+  echo "$as_me:21302: checking lex output file root" >&5
 echo $ECHO_N "checking lex output file root... $ECHO_C" >&6
 if test "${ac_cv_prog_lex_root+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21261,16 +21313,16 @@ if test -f lex.yy.c; then
 elif test -f lexyy.c; then
   ac_cv_prog_lex_root=lexyy
 else
-  { { echo "$as_me:21264: error: cannot find output from $LEX; giving up" >&5
+  { { echo "$as_me:21316: error: cannot find output from $LEX; giving up" >&5
 echo "$as_me: error: cannot find output from $LEX; giving up" >&2;}
    { (exit 1); exit 1; }; }
 fi
 fi
-echo "$as_me:21269: result: $ac_cv_prog_lex_root" >&5
+echo "$as_me:21321: result: $ac_cv_prog_lex_root" >&5
 echo "${ECHO_T}$ac_cv_prog_lex_root" >&6
 LEX_OUTPUT_ROOT=$ac_cv_prog_lex_root
 
-echo "$as_me:21273: checking whether yytext is a pointer" >&5
+echo "$as_me:21325: checking whether yytext is a pointer" >&5
 echo $ECHO_N "checking whether yytext is a pointer... $ECHO_C" >&6
 if test "${ac_cv_prog_lex_yytext_pointer+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
@@ -21286,16 +21338,16 @@ cat >conftest.$ac_ext <<_ACEOF
 `cat $LEX_OUTPUT_ROOT.c`
 _ACEOF
 rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:21289: \"$ac_link\"") >&5
+if { (eval echo "$as_me:21341: \"$ac_link\"") >&5
   (eval $ac_link) 2>&5
   ac_status=$?
-  echo "$as_me:21292: \$? = $ac_status" >&5
+  echo "$as_me:21344: \$? = $ac_status" >&5
   (exit $ac_status); } &&
          { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:21295: \"$ac_try\"") >&5
+  { (eval echo "$as_me:21347: \"$ac_try\"") >&5
   (eval $ac_try) 2>&5
   ac_status=$?
-  echo "$as_me:21298: \$? = $ac_status" >&5
+  echo "$as_me:21350: \$? = $ac_status" >&5
   (exit $ac_status); }; }; then
   ac_cv_prog_lex_yytext_pointer=yes
 else
@@ -21307,7 +21359,7 @@ LIBS=$ac_save_LIBS
 rm -f "${LEX_OUTPUT_ROOT}.c"
 
 fi
-echo "$as_me:21310: result: $ac_cv_prog_lex_yytext_pointer" >&5
+echo "$as_me:21362: result: $ac_cv_prog_lex_yytext_pointer" >&5
 echo "${ECHO_T}$ac_cv_prog_lex_yytext_pointer" >&6
 if test $ac_cv_prog_lex_yytext_pointer = yes; then
 
@@ -21447,7 +21499,7 @@ DEFS=-DHAVE_CONFIG_H
 : ${CONFIG_STATUS=./config.status}
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
-{ echo "$as_me:21450: creating $CONFIG_STATUS" >&5
+{ echo "$as_me:21502: creating $CONFIG_STATUS" >&5
 echo "$as_me: creating $CONFIG_STATUS" >&6;}
 cat >$CONFIG_STATUS <<_ACEOF
 #! $SHELL
@@ -21626,7 +21678,7 @@ cat >>$CONFIG_STATUS <<\EOF
     echo "$ac_cs_version"; exit 0 ;;
   --he | --h)
     # Conflict between --help and --header
-    { { echo "$as_me:21629: error: ambiguous option: $1
+    { { echo "$as_me:21681: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: ambiguous option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -21645,7 +21697,7 @@ Try \`$0 --help' for more information." >&2;}
     ac_need_defaults=false;;
 
   # This is an error.
-  -*) { { echo "$as_me:21648: error: unrecognized option: $1
+  -*) { { echo "$as_me:21700: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&5
 echo "$as_me: error: unrecognized option: $1
 Try \`$0 --help' for more information." >&2;}
@@ -21724,7 +21776,7 @@ do
   "gmp-mparam.h" ) CONFIG_LINKS="$CONFIG_LINKS gmp-mparam.h:mpn/$gmp_mparam_dir/gmp-mparam.h" ;;
   "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
   "config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS config.h:config.in" ;;
-  *) { { echo "$as_me:21727: error: invalid argument: $ac_config_target" >&5
+  *) { { echo "$as_me:21779: error: invalid argument: $ac_config_target" >&5
 echo "$as_me: error: invalid argument: $ac_config_target" >&2;}
    { (exit 1); exit 1; }; };;
   esac
@@ -21896,7 +21948,7 @@ s,@mpn_objs_in_libmp@,$mpn_objs_in_libmp,;t t
 s,@mpn_objects@,$mpn_objects,;t t
 s,@mpn_objs_in_libgmp@,$mpn_objs_in_libgmp,;t t
 s,@gmp_srclinks@,$gmp_srclinks,;t t
-s,@CFLAGS_IEEE_WITH_INEXACT@,$CFLAGS_IEEE_WITH_INEXACT,;t t
+s,@MPFR_CFLAGS@,$MPFR_CFLAGS,;t t
 s,@TUNE_SQR_OBJ@,$TUNE_SQR_OBJ,;t t
 s,@HAVE_CLOCK_01@,$HAVE_CLOCK_01,;t t
 s,@HAVE_CPUTIME_01@,$HAVE_CPUTIME_01,;t t
@@ -22029,7 +22081,7 @@ done; }
   esac
 
   if test x"$ac_file" != x-; then
-    { echo "$as_me:22032: creating $ac_file" >&5
+    { echo "$as_me:22084: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
     rm -f "$ac_file"
   fi
@@ -22047,7 +22099,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:22050: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:22102: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -22060,7 +22112,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:22063: error: cannot find input file: $f" >&5
+           { { echo "$as_me:22115: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -22121,7 +22173,7 @@ for ac_file in : $CONFIG_HEADERS; do test "x$ac_file" = x: && continue
   * )   ac_file_in=$ac_file.in ;;
   esac
 
-  test x"$ac_file" != x- && { echo "$as_me:22124: creating $ac_file" >&5
+  test x"$ac_file" != x- && { echo "$as_me:22176: creating $ac_file" >&5
 echo "$as_me: creating $ac_file" >&6;}
 
   # First look for the input files in the build tree, otherwise in the
@@ -22132,7 +22184,7 @@ echo "$as_me: creating $ac_file" >&6;}
       -) echo $tmp/stdin ;;
       [\\/$]*)
          # Absolute (can't be DOS-style, as IFS=:)
-         test -f "$f" || { { echo "$as_me:22135: error: cannot find input file: $f" >&5
+         test -f "$f" || { { echo "$as_me:22187: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          echo $f;;
@@ -22145,7 +22197,7 @@ echo "$as_me: error: cannot find input file: $f" >&2;}
            echo $srcdir/$f
          else
            # /dev/null tree
-           { { echo "$as_me:22148: error: cannot find input file: $f" >&5
+           { { echo "$as_me:22200: error: cannot find input file: $f" >&5
 echo "$as_me: error: cannot find input file: $f" >&2;}
    { (exit 1); exit 1; }; }
          fi;;
@@ -22262,7 +22314,7 @@ cat >>$CONFIG_STATUS <<\EOF
   rm -f $tmp/in
   if test x"$ac_file" != x-; then
     if cmp -s $ac_file $tmp/config.h 2>/dev/null; then
-      { echo "$as_me:22265: $ac_file is unchanged" >&5
+      { echo "$as_me:22317: $ac_file is unchanged" >&5
 echo "$as_me: $ac_file is unchanged" >&6;}
     else
       ac_dir=`$as_expr X"$ac_file" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
@@ -22319,11 +22371,11 @@ for ac_file in : $CONFIG_LINKS; do test "x$ac_file" = x: && continue
   ac_dest=`echo "$ac_file" | sed 's,:.*,,'`
   ac_source=`echo "$ac_file" | sed 's,[^:]*:,,'`
 
-  { echo "$as_me:22322: linking $srcdir/$ac_source to $ac_dest" >&5
+  { echo "$as_me:22374: linking $srcdir/$ac_source to $ac_dest" >&5
 echo "$as_me: linking $srcdir/$ac_source to $ac_dest" >&6;}
 
   if test ! -r $srcdir/$ac_source; then
-    { { echo "$as_me:22326: error: $srcdir/$ac_source: File not found" >&5
+    { { echo "$as_me:22378: error: $srcdir/$ac_source: File not found" >&5
 echo "$as_me: error: $srcdir/$ac_source: File not found" >&2;}
    { (exit 1); exit 1; }; }
   fi
@@ -22373,7 +22425,7 @@ done; }
   # Make a symlink if possible; otherwise try a hard link.
   ln -s $ac_rel_source $ac_dest 2>/dev/null ||
     ln $srcdir/$ac_source $ac_dest ||
-    { { echo "$as_me:22376: error: cannot link $ac_dest to $srcdir/$ac_source" >&5
+    { { echo "$as_me:22428: error: cannot link $ac_dest to $srcdir/$ac_source" >&5
 echo "$as_me: error: cannot link $ac_dest to $srcdir/$ac_source" >&2;}
    { (exit 1); exit 1; }; }
 done
diff --git a/cxx/Makefile.in b/cxx/Makefile.in
index aa4f8c96f..d1757fe0d 100644
--- a/cxx/Makefile.in
+++ b/cxx/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/demos/Makefile.in b/demos/Makefile.in
index d48a98c47..fa5807958 100644
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/demos/calc/Makefile.in b/demos/calc/Makefile.in
index c4187c2ed..4a508f7ba 100644
--- a/demos/calc/Makefile.in
+++ b/demos/calc/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/demos/expr/Makefile.in b/demos/expr/Makefile.in
index 9b57a1627..c7804a2a9 100644
--- a/demos/expr/Makefile.in
+++ b/demos/expr/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/mpbsd/Makefile.in b/mpbsd/Makefile.in
index 48819cc39..596ba31fa 100644
--- a/mpbsd/Makefile.in
+++ b/mpbsd/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/mpf/Makefile.in b/mpf/Makefile.in
index c909aa499..1fb48dad1 100644
--- a/mpf/Makefile.in
+++ b/mpf/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/mpfr/Makefile.in b/mpfr/Makefile.in
index 9ef698553..d7167fe1b 100644
--- a/mpfr/Makefile.in
+++ b/mpfr/Makefile.in
@@ -86,7 +86,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -113,6 +112,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -143,7 +143,7 @@ AUTOMAKE_OPTIONS = gnu no-dependencies $(top_builddir)/ansi2knr
 SUBDIRS = tests
 
 INCLUDES = -I$(top_srcdir)
-CFLAGS = @CFLAGS@ $(CFLAGS_IEEE_WITH_INEXACT)
+CFLAGS = @MPFR_CFLAGS@
 
 @WANT_MPFR_TRUE@lib_LIBRARIES = libmpfr.a
 @WANT_MPFR_TRUE@include_HEADERS = mpfr.h mpf2mpfr.h
diff --git a/mpfr/tests/Makefile.in b/mpfr/tests/Makefile.in
index 8b38b448b..303c8d8b6 100644
--- a/mpfr/tests/Makefile.in
+++ b/mpfr/tests/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -137,7 +137,7 @@ mpn_objs_in_libmp = @mpn_objs_in_libmp@
 AUTOMAKE_OPTIONS = gnu no-dependencies $(top_builddir)/ansi2knr
 
 INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/mpfr
-CFLAGS = @CFLAGS@ $(CFLAGS_IEEE_WITH_INEXACT)
+CFLAGS = @MPFR_CFLAGS@
 LDADD = ../libmpfr.a $(top_builddir)/libgmp.la $(LIBM)
 
 @WANT_MPFR_TRUE@check_PROGRAMS = reuse tabs tadd tagm tcan_round tcmp tcmp2 tcmp_ui tdiv tdiv_ui tdump teq texp tget_str tlog tconst_log2 tmul tmul_2exp tmul_ui tout_str tconst_pi tpow trandom tround_prec tset_d tset_f tset_q tset_si tset_str tset_z tsqrt tsqrt_ui tui_div tui_sub tswap ttrunc trint tisnan tget_d tatan tcosh tsinh ttanh tacosh tasinh tatanh thyperbolic texp2 tfactorial tsub tasin tconst_euler tcos tsin ttan tsub_ui tset tlog1p texpm1 tlog2 tlog10 tui_pow tpow3 tadd_ui texceptions tfma thypot tacos
diff --git a/mpn/Makefile.in b/mpn/Makefile.in
index 249e1056f..1777769f9 100644
--- a/mpn/Makefile.in
+++ b/mpn/Makefile.in
@@ -108,7 +108,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -135,6 +134,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/mpq/Makefile.in b/mpq/Makefile.in
index 67ee0a35f..453087940 100644
--- a/mpq/Makefile.in
+++ b/mpq/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/mpz/Makefile.in b/mpz/Makefile.in
index a08028d20..2000397ed 100644
--- a/mpz/Makefile.in
+++ b/mpz/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/printf/Makefile.in b/printf/Makefile.in
index 55573c10d..32c47d909 100644
--- a/printf/Makefile.in
+++ b/printf/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/scanf/Makefile.in b/scanf/Makefile.in
index 7ae6fa754..a010fc290 100644
--- a/scanf/Makefile.in
+++ b/scanf/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 739793b5b..17f2b5951 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -107,7 +107,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -134,6 +133,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/cxx/Makefile.in b/tests/cxx/Makefile.in
index 4322c7acd..9d3b3b8ba 100644
--- a/tests/cxx/Makefile.in
+++ b/tests/cxx/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/devel/Makefile.in b/tests/devel/Makefile.in
index 22a81850b..34e6619c5 100644
--- a/tests/devel/Makefile.in
+++ b/tests/devel/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index 0b0cb3039..f08ed0e25 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/mpbsd/Makefile.in b/tests/mpbsd/Makefile.in
index b032e180c..8a68cee7e 100644
--- a/tests/mpbsd/Makefile.in
+++ b/tests/mpbsd/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/mpf/Makefile.in b/tests/mpf/Makefile.in
index 95e5f25d6..b13bf3b9a 100644
--- a/tests/mpf/Makefile.in
+++ b/tests/mpf/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/mpn/Makefile.in b/tests/mpn/Makefile.in
index 1c334513a..56b83ae5b 100644
--- a/tests/mpn/Makefile.in
+++ b/tests/mpn/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/mpq/Makefile.in b/tests/mpq/Makefile.in
index 0760b58c4..a9ff2bc86 100644
--- a/tests/mpq/Makefile.in
+++ b/tests/mpq/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/mpz/Makefile.in b/tests/mpz/Makefile.in
index dc2683fc9..bf9d008e3 100644
--- a/tests/mpz/Makefile.in
+++ b/tests/mpz/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tests/rand/Makefile.in b/tests/rand/Makefile.in
index aaf661c29..a44877188 100644
--- a/tests/rand/Makefile.in
+++ b/tests/rand/Makefile.in
@@ -84,7 +84,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -111,6 +110,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
diff --git a/tune/Makefile.in b/tune/Makefile.in
index 618fcb403..753b59b5c 100644
--- a/tune/Makefile.in
+++ b/tune/Makefile.in
@@ -107,7 +107,6 @@ BITS_PER_MP_LIMB = @BITS_PER_MP_LIMB@
 CALLING_CONVENTIONS_OBJS = @CALLING_CONVENTIONS_OBJS@
 CC = @CC@
 CCAS = @CCAS@
-CFLAGS_IEEE_WITH_INEXACT = @CFLAGS_IEEE_WITH_INEXACT@
 CPP = @CPP@
 CXX = @CXX@
 CXXCPP = @CXXCPP@
@@ -134,6 +133,7 @@ LIBTOOL = @LIBTOOL@
 LN_S = @LN_S@
 M4 = @M4@
 MAINT = @MAINT@
+MPFR_CFLAGS = @MPFR_CFLAGS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@