Regenerate for:

* configure.in, Makefile.am, doc/gmp.texi, doc/configuration, tests/cxx/Makefile.am, demos/expr/Makefile.am, demos/expr/README, demos/expr/expr.c, demos/expr/expr.h, demos/expr/expr-config-h.in, demos/expr/expr-impl.h, demos/expr/run-expr.c, demos/expr/t-expr.c: MPFR now published separately, remove various bits.
author: Kevin Ryde <user42@zip.com.au> 2004-05-08 02:41:53 +0200
committer: Kevin Ryde <user42@zip.com.au> 2004-05-08 02:41:53 +0200
commit: 7d9d51bd70d055a28adc87ebecf7c8916fb6b154 (patch)
tree: 0386b683dc2b56dae3c732363b798b9483b83322
parent: 5941deb095d8916e793cfc5bda7002c2871cb887 (diff)
download: gmp-7d9d51bd70d055a28adc87ebecf7c8916fb6b154.tar.gz
27 files changed, 125 insertions, 2096 deletions
diff --git a/Makefile.in b/Makefile.in
index a48b99635..fb54e1ecc 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -67,8 +67,8 @@ DIST_COMMON = README $(am__configure_deps) $(am__include_HEADERS_DIST) \
 	install-sh ltmain.sh missing
 subdir = .
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -232,8 +232,7 @@ nodist_includeexecHEADERS_INSTALL = $(INSTALL_HEADER)
 HEADERS = $(include_HEADERS) $(nodist_includeexec_HEADERS)
 ETAGS = etags
 CTAGS = ctags
-DIST_SUBDIRS = tests mpn mpz mpq mpf printf scanf cxx mpbsd mpfr demos \
-	tune doc
+DIST_SUBDIRS = $(SUBDIRS)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
@@ -288,7 +287,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -319,9 +317,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -337,7 +332,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -346,8 +340,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
@@ -445,21 +437,7 @@ LIBGMPXX_LT_AGE = 0
 LIBMP_LT_CURRENT = 4
 LIBMP_LT_REVISION = 4
 LIBMP_LT_AGE = 1
-ACLOCAL_AMFLAGS = -I mpfr
-@MAINTAINER_MODE_TRUE@@WANT_MPFR_FALSE@MPFR_DIR = mpfr
-
-# FIXME: This is a workaround for automake not allowing info_TEXINFOS to be
-# conditionalized.  We want mpfr/mpfr.info only installed under
-# --enable-mpfr, but it and the rest of mpfr always included in a "make
-# dist".
-@WANT_MPFR_TRUE@MPFR_DIR = mpfr
-
-# "tests" ahead of "mpfr" ensures tests/t-constants is run before the
-# mpfr/tests programs.
-#
-SUBDIRS = tests mpn mpz mpq mpf printf scanf cxx mpbsd $(MPFR_DIR) \
-  demos tune doc
-
+SUBDIRS = tests mpn mpz mpq mpf printf scanf cxx mpbsd demos tune doc
 
 # The ansi2knr setups for the build programs are the same as the normal
 # automake ansi2knr rules, but using $(CC_FOR_BUILD) instead of $(CC).
@@ -1043,7 +1021,7 @@ distclean-tags:
 distdir: $(DISTFILES)
 	$(am__remove_distdir)
 	mkdir $(distdir)
-	$(mkdir_p) $(distdir)/. $(distdir)/demos $(distdir)/demos/calc $(distdir)/demos/expr $(distdir)/mpfr
+	$(mkdir_p) $(distdir)/. $(distdir)/demos $(distdir)/demos/calc $(distdir)/demos/expr
 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
 	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
 	list='$(DISTFILES)'; for file in $$list; do \
@@ -1070,7 +1048,7 @@ distdir: $(DISTFILES)
 	    || exit 1; \
 	  fi; \
 	done
-	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+	list='$(SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
 	    test -d "$(distdir)/$$subdir" \
 	    || mkdir "$(distdir)/$$subdir" \
diff --git a/aclocal.m4 b/aclocal.m4
index 99d80bf77..ccd1323c6 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -6633,5 +6633,4 @@ fi
 INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-m4_include([mpfr/acinclude.m4])
 m4_include([acinclude.m4])
diff --git a/config.in b/config.in
index 744669e98..b79dbc643 100644
--- a/config.in
+++ b/config.in
@@ -94,9 +94,6 @@ MA 02111-1307, USA.
    don't. */
 #undef HAVE_DECL_VFPRINTF
 
-/* Define if denormalized floats work. */
-#undef HAVE_DENORMS
-
 /* Define to 1 if you have the <dlfcn.h> header file. */
 #undef HAVE_DLFCN_H
 
@@ -163,12 +160,6 @@ MA 02111-1307, USA.
 #undef HAVE_HOST_CPU_pentium2
 #undef HAVE_HOST_CPU_pentium3
 
-/* Define if HUGE_VAL can be used without the need of a specific library. */
-#undef HAVE_HUGE_VAL
-
-/* Define if 0/0, 1/0, -1/0 and sqrt(-1) work to generate NaN/infinities. */
-#undef HAVE_INFS
-
 /* Define to 1 if the system has the type `intmax_t'. */
 #undef HAVE_INTMAX_T
 
@@ -181,15 +172,6 @@ MA 02111-1307, USA.
 /* Define to 1 if you have the <langinfo.h> header file. */
 #undef HAVE_LANGINFO_H
 
-/* Define one of the following to 1 for the format of a `long double'.
-   If your format is not among these choices, or you don't know what it is,
-   then leave all undefined.
-   IEEE_EXT is the 10-byte IEEE extended precision format.
-   IEEE_QUAD is the 16-byte IEEE quadruple precision format.
-   LITTLE or BIG is the endianness.  */
-#undef HAVE_LDOUBLE_IEEE_EXT_LITTLE
-#undef HAVE_LDOUBLE_IEEE_QUAD_BIG
-
 /* Define one of these to 1 for the endianness of `mp_limb_t'.
    If the endianness is not a simple big or little, or you don't know what
    it is, then leave both undefined. */
@@ -342,9 +324,6 @@ MA 02111-1307, USA.
 /* Define to 1 if the system has the type `std::locale'. */
 #undef HAVE_STD__LOCALE
 
-/* Define to 1 if you have the `strcasecmp' function. */
-#undef HAVE_STRCASECMP
-
 /* Define to 1 if you have the `strchr' function. */
 #undef HAVE_STRCHR
 
@@ -360,9 +339,6 @@ MA 02111-1307, USA.
 /* Define to 1 if you have the <string.h> header file. */
 #undef HAVE_STRING_H
 
-/* Define to 1 if you have the `strncasecmp' function. */
-#undef HAVE_STRNCASECMP
-
 /* Define to 1 if you have the `strnlen' function. */
 #undef HAVE_STRNLEN
 
@@ -387,9 +363,6 @@ MA 02111-1307, USA.
 /* Define to 1 if you have the <sys/attributes.h> header file. */
 #undef HAVE_SYS_ATTRIBUTES_H
 
-/* Define to 1 if you have the <sys/fpu.h> header file. */
-#undef HAVE_SYS_FPU_H
-
 /* Define to 1 if you have the <sys/iograph.h> header file. */
 #undef HAVE_SYS_IOGRAPH_H
 
@@ -447,13 +420,6 @@ 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
-
-/* Define to 1 if mpfr x86/amd64 test routines are available. */
-#undef MPFR_HAVE_TESTS_x86
-
 /* Name of package */
 #undef PACKAGE
 
@@ -514,9 +480,6 @@ MA 02111-1307, USA.
 /* Define to 1 to enable FFTs for multiplication, per --enable-fft */
 #undef WANT_FFT
 
-/* Define to 1 if --enable-mpfr */
-#undef WANT_MPFR
-
 /* Define to 1 if --enable-profiling=gprof */
 #undef WANT_PROFILING_GPROF
 
diff --git a/configure b/configure
index 528c39026..a1c820e03 100755
--- a/configure
+++ b/configure
@@ -1,5 +1,5 @@
 #! /bin/sh
-# From configure.in Revision: 1.630 .
+# From configure.in Revision: 1.631 .
 # Guess values for system-dependent variables and create Makefiles.
 # Generated by GNU Autoconf 2.59 for GNU MP 4.1.
 #
@@ -489,8 +489,7 @@ ac_includes_default="\
 # include <unistd.h>
 #endif"
 
-ac_config_libobj_dir=mpfr
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE WANT_MPFR_TRUE WANT_MPFR_FALSE GMP_NAIL_BITS ABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR AR ac_ct_AR LIBGMP_DLL LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks MPFR_LIBM TESTS_ASM_OBJECTS LIBOBJS MPFR_CFLAGS MPFR_LIBS TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT HAVE_MPFR_01 HAVE_DECL_OPTARG LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT WANT_MPBSD_TRUE WANT_MPBSD_FALSE GMP_NAIL_BITS ABI HAVE_HOST_CPU_FAMILY_power HAVE_HOST_CPU_FAMILY_powerpc GMP_LDFLAGS LIBGMP_LDFLAGS LIBGMPXX_LDFLAGS SPEED_CYCLECOUNTER_OBJ CALLING_CONVENTIONS_OBJS DEFN_LONG_LONG_LIMB CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT CPP CC_FOR_BUILD CPP_FOR_BUILD EXEEXT_FOR_BUILD U_FOR_BUILD LIBM_FOR_BUILD CCAS CXX CXXFLAGS ac_ct_CXX WANT_CXX_TRUE WANT_CXX_FALSE CXXCPP EGREP U ANSI2KNR AR ac_ct_AR LIBGMP_DLL LN_S ECHO RANLIB ac_ct_RANLIB DLLTOOL ac_ct_DLLTOOL AS ac_ct_AS OBJDUMP ac_ct_OBJDUMP LIBTOOL ENABLE_STATIC_TRUE ENABLE_STATIC_FALSE LIBM TAL_OBJECT M4 BITS_PER_MP_LIMB mpn_objs_in_libmp mpn_objects mpn_objs_in_libgmp gmp_srclinks TUNE_SQR_OBJ HAVE_CLOCK_01 HAVE_CPUTIME_01 HAVE_GETRUSAGE_01 HAVE_GETTIMEOFDAY_01 HAVE_SIGACTION_01 HAVE_SIGALTSTACK_01 HAVE_SIGSTACK_01 HAVE_SYS_RESOURCE_H_01 HAVE_STACK_T_01 LIBCURSES WITH_READLINE_01 LIBREADLINE YACC LEX LEXLIB LEX_OUTPUT_ROOT HAVE_DECL_OPTARG LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -1068,7 +1067,6 @@ Optional Features:
   --enable-fft            enable FFTs for multiplication [default=yes]
   --enable-mpbsd          build Berkeley MP compatibility library
                           [default=no]
-  --enable-mpfr           build MPFR [default=no]
   --enable-nails          use nails on limbs [default=no]
   --enable-profiling      build with profiler support [default=no]
   --enable-shared[=PKGS]
@@ -1588,7 +1586,6 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 
 
 
-
 # If --target is not used then $target_alias is empty, but if say
 # "./configure athlon-pc-freebsd3.5" is used, then all three of
 # $build_alias, $host_alias and $target_alias are set to
@@ -2252,37 +2249,6 @@ fi
 
 
 
-# Check whether --enable-mpfr or --disable-mpfr was given.
-if test "${enable_mpfr+set}" = set; then
-  enableval="$enable_mpfr"
-  case $enableval in
-yes|no) ;;
-*) { { echo "$as_me:$LINENO: error: bad value $enableval for --enable-mpfr, need yes or no" >&5
-echo "$as_me: error: bad value $enableval for --enable-mpfr, need yes or no" >&2;}
-   { (exit 1); exit 1; }; } ;;
-esac
-else
-  enable_mpfr=no
-fi;
-
-
-if test "$enable_mpfr" = "yes"; then
-  WANT_MPFR_TRUE=
-  WANT_MPFR_FALSE='#'
-else
-  WANT_MPFR_TRUE='#'
-  WANT_MPFR_FALSE=
-fi
-
-if test "$enable_mpfr" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define WANT_MPFR 1
-_ACEOF
-
-fi
-
-
 # Check whether --enable-nails or --disable-nails was given.
 if test "${enable_nails+set}" = set; then
   enableval="$enable_nails"
@@ -2732,6 +2698,10 @@ echo "include_mpn(\`arm/arm-defs.m4')" >> $gmp_tmpconfigm4i
 
     case $host in
       hppa2.0*-*-* | hppa64-*-*)
+        # HP cc +O3 in the past had been seen causing problems for mpfr
+        # tests/tdiv.c, apparently relating to hardware float tests.  This
+        # shouldn't affect us (and shouldn't affect mpfr any more either.)
+        #
 	cclist_20n="gcc cc"
         abilist="2.0n 1.0"
         path_20n="pa64"
@@ -2748,7 +2718,6 @@ echo "include_mpn(\`arm/arm-defs.m4')" >> $gmp_tmpconfigm4i
         gcc_20n_cflags_arch="-mpa-risc-2-0 -mpa-risc-1-1"
         gcc_20n_testlist="sizeof-long-4 hppa-level-2.0"
 
-        # +O3 causes problems with fp rounding in mpfr/tests/tdiv.
         cc_20n_cflags="+DA2.0 +e +O2 -Wl,+vnocompatwarnings"
         cc_20n_testlist="hpc-hppa-2-0"
 
@@ -2767,7 +2736,6 @@ echo "include_mpn(\`arm/arm-defs.m4')" >> $gmp_tmpconfigm4i
 
           cclist_20w="gcc cc"
 	  gcc_20w_cflags="-O2 -mpa-risc-2-0"
-	  # +O3 causes problems with fp rounding in mpfr/tests/tdiv.
           cc_20w_cflags="+DD64 +O2"
           cc_20w_testlist="hpc-hppa-2-0"
           path_20w="pa64"
@@ -9802,7 +9770,7 @@ ia64-*-hpux*)
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 9805 "configure"' > conftest.$ac_ext
+  echo '#line 9773 "configure"' > conftest.$ac_ext
   if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -11247,11 +11215,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11250: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11218: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11254: \$? = $ac_status" >&5
+   echo "$as_me:11222: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11480,11 +11448,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11483: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11451: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:11487: \$? = $ac_status" >&5
+   echo "$as_me:11455: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -11540,11 +11508,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:11543: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:11511: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:11547: \$? = $ac_status" >&5
+   echo "$as_me:11515: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -13724,7 +13692,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13727 "configure"
+#line 13695 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -13822,7 +13790,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 13825 "configure"
+#line 13793 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -16001,11 +15969,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16004: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:15972: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:16008: \$? = $ac_status" >&5
+   echo "$as_me:15976: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -16061,11 +16029,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:16064: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:16032: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:16068: \$? = $ac_status" >&5
+   echo "$as_me:16036: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -17422,7 +17390,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17425 "configure"
+#line 17393 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -17520,7 +17488,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 17523 "configure"
+#line 17491 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -18347,11 +18315,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18350: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18318: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:18354: \$? = $ac_status" >&5
+   echo "$as_me:18322: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -18407,11 +18375,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:18410: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:18378: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:18414: \$? = $ac_status" >&5
+   echo "$as_me:18382: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -20441,11 +20409,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20444: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20412: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:20448: \$? = $ac_status" >&5
+   echo "$as_me:20416: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -20674,11 +20642,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20677: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20645: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:20681: \$? = $ac_status" >&5
+   echo "$as_me:20649: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
@@ -20734,11 +20702,11 @@ else
    -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:20737: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:20705: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:20741: \$? = $ac_status" >&5
+   echo "$as_me:20709: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
@@ -22918,7 +22886,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 22921 "configure"
+#line 22889 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -23016,7 +22984,7 @@ else
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<EOF
-#line 23019 "configure"
+#line 22987 "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -31703,1655 +31671,6 @@ done
 
 
 
-# Configs for mpfr.
-#
-
-if test $enable_mpfr = yes; then
-  gmp_CFLAGS=$CFLAGS
-  gmp_LIBS=$LIBS
-  LIBS="$LIBS $LIBM"
-
-
-MPFR_LIBM=''
-
-case $host in
-  *-*-beos* | *-*-cygwin* | *-*-pw32*)
-    # According to libtool AC CHECK LIBM, these systems don't have libm
-    ;;
-  *-*-hpux*)
-    # -lM means something subtly different to -lm, SVID style error handling
-    # or something.  FIXME: Why exactly do we want this?
-    echo "$as_me:$LINENO: checking for main in -lM" >&5
-echo $ECHO_N "checking for main in -lM... $ECHO_C" >&6
-if test "${ac_cv_lib_M_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lM  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_M_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_M_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_M_main" >&5
-echo "${ECHO_T}$ac_cv_lib_M_main" >&6
-if test $ac_cv_lib_M_main = yes; then
-  MPFR_LIBM="-lM"
-fi
-
-    ;;
-  *-*-solaris*)
-    # On Solaris the math functions new in C99 are in -lm9x.
-    # FIXME: Do we need -lm9x as well as -lm, or just instead of?
-    echo "$as_me:$LINENO: checking for main in -lm9x" >&5
-echo $ECHO_N "checking for main in -lm9x... $ECHO_C" >&6
-if test "${ac_cv_lib_m9x_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm9x  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_m9x_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_m9x_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m9x_main" >&5
-echo "${ECHO_T}$ac_cv_lib_m9x_main" >&6
-if test $ac_cv_lib_m9x_main = yes; then
-  MPFR_LIBM="-lm9x"
-fi
-
-    echo "$as_me:$LINENO: checking for main in -lm" >&5
-echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
-if test "${ac_cv_lib_m_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_m_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_m_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
-echo "${ECHO_T}$ac_cv_lib_m_main" >&6
-if test $ac_cv_lib_m_main = yes; then
-  MPFR_LIBM="$MPFR_LIBM -lm"
-fi
-
-    ;;
-  *-ncr-sysv4.3*)
-    # FIXME: What does -lmw mean?  Libtool AC CHECK LIBM does it this way.
-    echo "$as_me:$LINENO: checking for _mwvalidcheckl in -lmw" >&5
-echo $ECHO_N "checking for _mwvalidcheckl in -lmw... $ECHO_C" >&6
-if test "${ac_cv_lib_mw__mwvalidcheckl+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lmw  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char _mwvalidcheckl ();
-int
-main ()
-{
-_mwvalidcheckl ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_mw__mwvalidcheckl=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_mw__mwvalidcheckl=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_mw__mwvalidcheckl" >&5
-echo "${ECHO_T}$ac_cv_lib_mw__mwvalidcheckl" >&6
-if test $ac_cv_lib_mw__mwvalidcheckl = yes; then
-  MPFR_LIBM="-lmw"
-fi
-
-    echo "$as_me:$LINENO: checking for main in -lm" >&5
-echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
-if test "${ac_cv_lib_m_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_m_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_m_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
-echo "${ECHO_T}$ac_cv_lib_m_main" >&6
-if test $ac_cv_lib_m_main = yes; then
-  MPFR_LIBM="$MPFR_LIBM -lm"
-fi
-
-    ;;
-  *)
-    echo "$as_me:$LINENO: checking for main in -lm" >&5
-echo $ECHO_N "checking for main in -lm... $ECHO_C" >&6
-if test "${ac_cv_lib_m_main+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  ac_check_lib_save_LIBS=$LIBS
-LIBS="-lm  $LIBS"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-
-int
-main ()
-{
-main ();
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_lib_m_main=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_lib_m_main=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS=$ac_check_lib_save_LIBS
-fi
-echo "$as_me:$LINENO: result: $ac_cv_lib_m_main" >&5
-echo "${ECHO_T}$ac_cv_lib_m_main" >&6
-if test $ac_cv_lib_m_main = yes; then
-  MPFR_LIBM="-lm"
-fi
-
-    ;;
-esac
-
-
-
-
-
-
-# CPU-dependent objects for the test programs
-case $host in
-  i?86*-*-* | k[5-8]*-*-* | pentium*-*-* | athlon-*-* | viac3*-*-*)
-    TESTS_ASM_OBJECTS=x86.$OBJEXT
-
-
-cat >>confdefs.h <<\_ACEOF
-#define MPFR_HAVE_TESTS_x86 1
-_ACEOF
-
-    ;;
-  amd64-*-*)
-    TESTS_ASM_OBJECTS=amd64.$OBJEXT
-
-    cat >>confdefs.h <<\_ACEOF
-#define MPFR_HAVE_TESTS_x86 1
-_ACEOF
-
-    ;;
-esac
-
-
-for ac_header in sys/time.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: 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
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to bug-gmp@gnu.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: 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
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-# Reasons for testing:
-#   gettimeofday - not in mingw
-#
-
-for ac_func in gettimeofday
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: 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 <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-done
-
-
-
-for ac_func in strcasecmp strncasecmp
-do
-as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
-echo "$as_me:$LINENO: 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
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-/* Define $ac_func to an innocuous variant, in case <limits.h> declares $ac_func.
-   For example, HP-UX 11i <limits.h> declares gettimeofday.  */
-#define $ac_func innocuous_$ac_func
-
-/* System header to define __stub macros and hopefully few prototypes,
-    which can conflict with char $ac_func (); below.
-    Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-    <limits.h> exists even on freestanding compilers.  */
-
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-
-#undef $ac_func
-
-/* Override any gcc2 internal prototype to avoid an error.  */
-#ifdef __cplusplus
-extern "C"
-{
-#endif
-/* We use char because int might match the return type of a gcc2
-   builtin and then its argument prototype would still apply.  */
-char $ac_func ();
-/* The GNU C library defines this for functions which it implements
-    to always fail with ENOSYS.  Some functions are actually named
-    something starting with __ and the normal name is an alias.  */
-#if defined (__stub_$ac_func) || defined (__stub___$ac_func)
-choke me
-#else
-char (*f) () = $ac_func;
-#endif
-#ifdef __cplusplus
-}
-#endif
-
-int
-main ()
-{
-return f != $ac_func;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  eval "$as_ac_var=yes"
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-eval "$as_ac_var=no"
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: 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 <<_ACEOF
-#define `echo "HAVE_$ac_func" | $as_tr_cpp` 1
-_ACEOF
-
-else
-  case $LIBOBJS in
-    "$ac_func.$ac_objext"   | \
-  *" $ac_func.$ac_objext"   | \
-    "$ac_func.$ac_objext "* | \
-  *" $ac_func.$ac_objext "* ) ;;
-  *) LIBOBJS="$LIBOBJS $ac_func.$ac_objext" ;;
-esac
-
-fi
-done
-
-
-
-case $host in
-alpha*-*-*)
-  saved_CFLAGS="$CFLAGS"
-  echo "$as_me:$LINENO: checking for IEEE-754 switches" >&5
-echo $ECHO_N "checking for IEEE-754 switches... $ECHO_C" >&6
-if test "${mpfr_cv_ieee_switches+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-  if test -n "$GCC"; then
-    mpfr_cv_ieee_switches="-mfp-rounding-mode=d -mieee-with-inexact"
-  else
-    mpfr_cv_ieee_switches="-fprm d -ieee_with_inexact"
-  fi
-  CFLAGS="$CFLAGS $mpfr_cv_ieee_switches"
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  :
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-mpfr_cv_ieee_switches="none"
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $mpfr_cv_ieee_switches" >&5
-echo "${ECHO_T}$mpfr_cv_ieee_switches" >&6
-  if test "$mpfr_cv_ieee_switches" = "none"; then
-    CFLAGS="$saved_CFLAGS"
-  else
-    CFLAGS="$saved_CFLAGS $mpfr_cv_ieee_switches"
-  fi
-esac
-
-# Reasons for testing:
-#
-#   sys/fpu.h - MIPS specific
-#
-
-for ac_header in sys/fpu.h
-do
-as_ac_Header=`echo "ac_cv_header_$ac_header" | $as_tr_sh`
-if eval "test \"\${$as_ac_Header+set}\" = set"; then
-  echo "$as_me:$LINENO: 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
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-else
-  # Is the header compilable?
-echo "$as_me:$LINENO: checking $ac_header usability" >&5
-echo $ECHO_N "checking $ac_header usability... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-#include <$ac_header>
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_header_compiler=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_header_compiler=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_compiler" >&5
-echo "${ECHO_T}$ac_header_compiler" >&6
-
-# Is the header present?
-echo "$as_me:$LINENO: checking $ac_header presence" >&5
-echo $ECHO_N "checking $ac_header presence... $ECHO_C" >&6
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <$ac_header>
-_ACEOF
-if { (eval echo "$as_me:$LINENO: \"$ac_cpp conftest.$ac_ext\"") >&5
-  (eval $ac_cpp conftest.$ac_ext) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } >/dev/null; then
-  if test -s conftest.err; then
-    ac_cpp_err=$ac_c_preproc_warn_flag
-    ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
-  else
-    ac_cpp_err=
-  fi
-else
-  ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
-  ac_header_preproc=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-  ac_header_preproc=no
-fi
-rm -f conftest.err conftest.$ac_ext
-echo "$as_me:$LINENO: result: $ac_header_preproc" >&5
-echo "${ECHO_T}$ac_header_preproc" >&6
-
-# So?  What about this header?
-case $ac_header_compiler:$ac_header_preproc:$ac_c_preproc_warn_flag in
-  yes:no: )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&5
-echo "$as_me: WARNING: $ac_header: accepted by the compiler, rejected by the preprocessor!" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the compiler's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the compiler's result" >&2;}
-    ac_header_preproc=yes
-    ;;
-  no:yes:* )
-    { echo "$as_me:$LINENO: WARNING: $ac_header: present but cannot be compiled" >&5
-echo "$as_me: WARNING: $ac_header: present but cannot be compiled" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     check for missing prerequisite headers?" >&5
-echo "$as_me: WARNING: $ac_header:     check for missing prerequisite headers?" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: see the Autoconf documentation" >&5
-echo "$as_me: WARNING: $ac_header: see the Autoconf documentation" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&5
-echo "$as_me: WARNING: $ac_header:     section \"Present But Cannot Be Compiled\"" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: proceeding with the preprocessor's result" >&5
-echo "$as_me: WARNING: $ac_header: proceeding with the preprocessor's result" >&2;}
-    { echo "$as_me:$LINENO: WARNING: $ac_header: in the future, the compiler will take precedence" >&5
-echo "$as_me: WARNING: $ac_header: in the future, the compiler will take precedence" >&2;}
-    (
-      cat <<\_ASBOX
-## ------------------------------ ##
-## Report this to bug-gmp@gnu.org ##
-## ------------------------------ ##
-_ASBOX
-    ) |
-      sed "s/^/$as_me: WARNING:     /" >&2
-    ;;
-esac
-echo "$as_me:$LINENO: 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
-  eval "$as_ac_Header=\$ac_header_preproc"
-fi
-echo "$as_me:$LINENO: result: `eval echo '${'$as_ac_Header'}'`" >&5
-echo "${ECHO_T}`eval echo '${'$as_ac_Header'}'`" >&6
-
-fi
-if test `eval echo '${'$as_ac_Header'}'` = yes; then
-  cat >>confdefs.h <<_ACEOF
-#define `echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-echo "$as_me:$LINENO: checking for fesetround" >&5
-echo $ECHO_N "checking for fesetround... $ECHO_C" >&6
-if test "${mpfr_cv_have_fesetround+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-saved_LIBS="$LIBS"
-LIBS="$LIBS $MPFR_LIBM"
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <fenv.h>
-int
-main ()
-{
-fesetround(FE_TONEAREST);
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  mpfr_cv_have_fesetround=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-mpfr_cv_have_fesetround=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-LIBS="$saved_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $mpfr_cv_have_fesetround" >&5
-echo "${ECHO_T}$mpfr_cv_have_fesetround" >&6
-if test "$mpfr_cv_have_fesetround" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define MPFR_HAVE_FESETROUND 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for valid NaN" >&5
-echo $ECHO_N "checking for valid NaN... $ECHO_C" >&6
-if test "${mpfr_cv_valid_nan+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test "$cross_compiling" = yes; then
-  mpfr_cv_valid_nan=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <math.h>
-int main()
-{
-  double x = (0.0/0.0) + sqrt(-1.0);
-  return x == 1.0/0.0;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  mpfr_cv_valid_nan=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-mpfr_cv_valid_nan=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-fi
-echo "$as_me:$LINENO: result: $mpfr_cv_valid_nan" >&5
-echo "${ECHO_T}$mpfr_cv_valid_nan" >&6
-if test "$mpfr_cv_valid_nan" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_INFS 1
-_ACEOF
-
-fi
-
-if test -n "$GCC"; then
-  echo "$as_me:$LINENO: checking for gcc float-conversion bug" >&5
-echo $ECHO_N "checking for gcc float-conversion bug... $ECHO_C" >&6
-if test "${mpfr_cv_gcc_floatconv_bug+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-  saved_LIBS="$LIBS"
-  LIBS="$LIBS $MPFR_LIBM"
-  if test "$cross_compiling" = yes; then
-  mpfr_cv_gcc_floatconv_bug="cannot test, use -ffloat-store"
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#include <float.h>
-#ifdef MPFR_HAVE_FESETROUND
-#include <fenv.h>
-#endif
-int main()
-{
-  double x = 0.5;
-  int i;
-  for (i = 1; i <= 11; i++)
-    x *= x;
-  if (x != 0)
-    return 1;
-#ifdef MPFR_HAVE_FESETROUND
-  /* Useful test for the G4 PowerPC */
-  fesetround(FE_TOWARDZERO);
-  x = DBL_MAX;
-  x *= 2.0;
-  if (x != DBL_MAX)
-    return 1;
-#endif
-  return 0;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  mpfr_cv_gcc_floatconv_bug="no"
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-mpfr_cv_gcc_floatconv_bug="yes, use -ffloat-store"
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-  LIBS="$saved_LIBS"
-
-fi
-echo "$as_me:$LINENO: result: $mpfr_cv_gcc_floatconv_bug" >&5
-echo "${ECHO_T}$mpfr_cv_gcc_floatconv_bug" >&6
-  if test "$mpfr_cv_gcc_floatconv_bug" != "no"; then
-    CFLAGS="$CFLAGS -ffloat-store"
-  fi
-fi
-
-echo "$as_me:$LINENO: checking for denormalized numbers" >&5
-echo $ECHO_N "checking for denormalized numbers... $ECHO_C" >&6
-if test "${mpfr_cv_have_denorms+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-if test "$cross_compiling" = yes; then
-  mpfr_cv_have_denorms=no
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-
-#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;
-}
-
-_ACEOF
-rm -f conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } && { ac_try='./conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  mpfr_cv_have_denorms=yes
-else
-  echo "$as_me: program exited with status $ac_status" >&5
-echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-( exit $ac_status )
-mpfr_cv_have_denorms=no
-fi
-rm -f core *.core gmon.out bb.out conftest$ac_exeext conftest.$ac_objext conftest.$ac_ext
-fi
-
-fi
-echo "$as_me:$LINENO: result: $mpfr_cv_have_denorms" >&5
-echo "${ECHO_T}$mpfr_cv_have_denorms" >&6
-if test "$mpfr_cv_have_denorms" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_DENORMS 1
-_ACEOF
-
-fi
-
-echo "$as_me:$LINENO: checking for HUGE_VAL" >&5
-echo $ECHO_N "checking for HUGE_VAL... $ECHO_C" >&6
-if test "${mpfr_cv_have_huge_val+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-
-cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-#include <math.h>
-int
-main ()
-{
-HUGE_VAL;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
-  (eval $ac_link) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest$ac_exeext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  mpfr_cv_have_huge_val=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-mpfr_cv_have_huge_val=no
-fi
-rm -f conftest.err conftest.$ac_objext \
-      conftest$ac_exeext conftest.$ac_ext
-
-fi
-echo "$as_me:$LINENO: result: $mpfr_cv_have_huge_val" >&5
-echo "${ECHO_T}$mpfr_cv_have_huge_val" >&6
-if test "$mpfr_cv_have_huge_val" = "yes"; then
-
-cat >>confdefs.h <<\_ACEOF
-#define HAVE_HUGE_VAL 1
-_ACEOF
-
-fi
-
-
-
-
-echo "$as_me:$LINENO: checking for long double" >&5
-echo $ECHO_N "checking for long double... $ECHO_C" >&6
-if test "${ac_cv_type_long_double+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h.  */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h.  */
-$ac_includes_default
-int
-main ()
-{
-if ((long double *) 0)
-  return 0;
-if (sizeof (long double))
-  return 0;
-  ;
-  return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext
-if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
-  (eval $ac_compile) 2>conftest.er1
-  ac_status=$?
-  grep -v '^ *+' conftest.er1 >conftest.err
-  rm -f conftest.er1
-  cat conftest.err >&5
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); } &&
-	 { ac_try='test -z "$ac_c_werror_flag"
-			 || test ! -s conftest.err'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; } &&
-	 { ac_try='test -s conftest.$ac_objext'
-  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
-  (eval $ac_try) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; }; then
-  ac_cv_type_long_double=yes
-else
-  echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-ac_cv_type_long_double=no
-fi
-rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-echo "$as_me:$LINENO: result: $ac_cv_type_long_double" >&5
-echo "${ECHO_T}$ac_cv_type_long_double" >&6
-if test $ac_cv_type_long_double = yes; then
-
-cat >>confdefs.h <<_ACEOF
-#define HAVE_LONG_DOUBLE 1
-_ACEOF
-
-
-fi
-
-echo "$as_me:$LINENO: checking format of \`long double' floating point" >&5
-echo $ECHO_N "checking format of \`long double' floating point... $ECHO_C" >&6
-if test "${mpfr_cv_c_long_double_format+set}" = set; then
-  echo $ECHO_N "(cached) $ECHO_C" >&6
-else
-  mpfr_cv_c_long_double_format=unknown
-if test "$ac_cv_type_long_double" != yes; then
-  mpfr_cv_c_long_double_format="not available"
-else
-  cat >conftest.c <<\EOF
-
-/* "before" is 16 bytes to ensure there's no padding between it and "x".
-   We're not expecting any "long double" bigger than 16 bytes or with
-   alignment requirements stricter than 16 bytes.  */
-struct {
-  char         before[16];
-  long double  x;
-  char         after[8];
-} foo = {
-  { '\0', '\0', '\0', '\0', '\0', '\0', '\0', '\0',
-    '\001', '\043', '\105', '\147', '\211', '\253', '\315', '\357' },
-  -123456789.0,
-  { '\376', '\334', '\272', '\230', '\166', '\124', '\062', '\020' }
-};
-
-EOF
-  mpfr_compile="$CC $CFLAGS $CPPFLAGS -c conftest.c >&5 2>&1"
-  if { (eval echo "$as_me:$LINENO: \"$mpfr_compile\"") >&5
-  (eval $mpfr_compile) 2>&5
-  ac_status=$?
-  echo "$as_me:$LINENO: \$? = $ac_status" >&5
-  (exit $ac_status); }; then
-    cat >conftest.awk <<\EOF
-
-BEGIN {
-  found = 0
-}
-
-# got[] holds a sliding window of bytes read the input.  got[0] is the most
-# recent byte read, and got[31] the oldest byte read, so when looking to
-# match some data the indices are "reversed".
-#
-{
-  for (f = 2; f <= NF; f++)
-    {
-      # new byte, shift others up
-      for (i = 31; i >= 0; i--)
-        got[i+1] = got[i];
-      got[0] = $f;
-
-      # end sequence
-      if (got[7] != "376") continue
-      if (got[6] != "334") continue
-      if (got[5] != "272") continue
-      if (got[4] != "230") continue
-      if (got[3] != "166") continue
-      if (got[2] != "124") continue
-      if (got[1] != "062") continue
-      if (got[0] != "020") continue
-
-      # start sequence, with 12-byte body
-      if (got[27] == "001" && \
-          got[26] == "043" && \
-          got[25] == "105" && \
-          got[24] == "147" && \
-          got[23] == "211" && \
-          got[22] == "253" && \
-          got[21] == "315" && \
-          got[20] == "357")
-        {
-          saw = " (" got[19] \
-                 " " got[18] \
-                 " " got[17] \
-                 " " got[16] \
-                 " " got[15] \
-                 " " got[14] \
-                 " " got[13] \
-                 " " got[12] \
-                 " " got[11] \
-                 " " got[10] \
-                 " " got[9]  \
-                 " " got[8] ")"
-
-          if (got[19] == "000" && \
-              got[18] == "000" && \
-              got[17] == "000" && \
-              got[16] == "000" && \
-              got[15] == "240" && \
-              got[14] == "242" && \
-              got[13] == "171" && \
-              got[12] == "353" && \
-              got[11] == "031" && \
-              got[10] == "300")
-            {
-              print "IEEE extended, little endian"
-              found = 1
-              exit
-            }
-        }
-
-      # start sequence, with 16-byte body
-      if (got[31] == "001" && \
-          got[30] == "043" && \
-          got[29] == "105" && \
-          got[28] == "147" && \
-          got[27] == "211" && \
-          got[26] == "253" && \
-          got[25] == "315" && \
-          got[24] == "357")
-        {
-          saw = " (" got[23] \
-                 " " got[22] \
-                 " " got[21] \
-                 " " got[20] \
-                 " " got[19] \
-                 " " got[18] \
-                 " " got[17] \
-                 " " got[16] \
-                 " " got[15] \
-                 " " got[14] \
-                 " " got[13] \
-                 " " got[12] \
-                 " " got[11] \
-                 " " got[10] \
-                 " " got[9]  \
-                 " " got[8] ")"
-
-          if (got[23] == "000" && \
-              got[22] == "000" && \
-              got[21] == "000" && \
-              got[20] == "000" && \
-              got[19] == "240" && \
-              got[18] == "242" && \
-              got[17] == "171" && \
-              got[16] == "353" && \
-              got[15] == "031" && \
-              got[14] == "300")
-            {
-              print "IEEE extended, little endian"
-              found = 1
-              exit
-            }
-
-          if (got[23] == "300" && \
-	      got[22] == "031" && \
-	      got[21] == "326" && \
-	      got[20] == "363" && \
-	      got[19] == "105" && \
-	      got[18] == "100" && \
-	      got[17] == "000" && \
-	      got[16] == "000" && \
-	      got[15] == "000" && \
-	      got[14] == "000" && \
-	      got[13] == "000" && \
-	      got[12] == "000" && \
-	      got[11] == "000" && \
-	      got[10] == "000" && \
-	      got[9]  == "000" && \
-	      got[8]  == "000")
-            {
-              print "IEEE quad, big endian"
-              found = 1
-              exit
-            }
-        }
-    }
-}
-
-END {
-  if (! found)
-    print "unknown", saw
-}
-
-EOF
-    mpfr_cv_c_long_double_format=`od -b conftest.$OBJEXT | $AWK -f conftest.awk`
-    case $mpfr_cv_c_long_double_format in
-    unknown*)
-      echo "cannot match anything, conftest.$OBJEXT contains" >&5
-      od -b conftest.$OBJEXT >&5
-      ;;
-    esac
-  else
-    { echo "$as_me:$LINENO: WARNING: oops, cannot compile test program" >&5
-echo "$as_me: WARNING: oops, cannot compile test program" >&2;}
-  fi
-fi
-rm -f conftest*
-
-fi
-echo "$as_me:$LINENO: result: $mpfr_cv_c_long_double_format" >&5
-echo "${ECHO_T}$mpfr_cv_c_long_double_format" >&6
-
-
-
-
-case $mpfr_cv_c_long_double_format in
-  "IEEE extended, little endian")
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_LDOUBLE_IEEE_EXT_LITTLE 1
-_ACEOF
-
-    ;;
-  "IEEE quad, big endian")
-    cat >>confdefs.h <<\_ACEOF
-#define HAVE_LDOUBLE_IEEE_QUAD_BIG 1
-_ACEOF
-
-    ;;
-  unknown* | "not available")
-    ;;
-  *)
-    { echo "$as_me:$LINENO: WARNING: oops, unrecognised float format: $mpfr_cv_c_long_double_format" >&5
-echo "$as_me: WARNING: oops, unrecognised float format: $mpfr_cv_c_long_double_format" >&2;}
-    ;;
-esac
-
-
-
-  MPFR_CFLAGS=$CFLAGS
-
-  MPFR_LIBS=$LIBS
-
-  CFLAGS=$gmp_CFLAGS
-  LIBS=$gmp_LIBS
-fi
-
-
 # A recompiled sqr_basecase for use in the tune program, if necessary.
 TUNE_SQR_OBJ=
 test -d tune || mkdir tune
@@ -34361,12 +32680,6 @@ fi
 # Configs for demos/expr directory
           ac_config_files="$ac_config_files demos/expr/expr-config.h:demos/expr/expr-config-h.in"
 
-if test $enable_mpfr = yes; then
-  HAVE_MPFR_01=1
-
-else
-  HAVE_MPFR_01=0
-fi
 if test $ac_cv_have_decl_optarg = yes; then
   HAVE_DECL_OPTARG=1
 
@@ -34404,7 +32717,7 @@ echo "define(\`__CONFIG_M4_INCLUDED__')" >> $gmp_configm4
 # FIXME: Upcoming version of autoconf/automake may not like broken lines.
 #        Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
 
-                                                                                                                                                                                                                                                                                        ac_config_files="$ac_config_files Makefile mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile tests/mpf/Makefile tests/mpn/Makefile tests/mpq/Makefile tests/mpz/Makefile tests/rand/Makefile tests/misc/Makefile tests/cxx/Makefile mpfr/Makefile mpfr/tests/Makefile doc/Makefile tune/Makefile demos/Makefile demos/calc/Makefile demos/expr/Makefile gmp.h:gmp-h.in mp.h:mp-h.in"
+                                                                                                                                                                                                                                                                    ac_config_files="$ac_config_files Makefile mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile tests/Makefile tests/devel/Makefile tests/mpbsd/Makefile tests/mpf/Makefile tests/mpn/Makefile tests/mpq/Makefile tests/mpz/Makefile tests/rand/Makefile tests/misc/Makefile tests/cxx/Makefile doc/Makefile tune/Makefile demos/Makefile demos/calc/Makefile demos/expr/Makefile gmp.h:gmp-h.in mp.h:mp-h.in"
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
 # tests run on this system so they can be shared between configure
@@ -34510,13 +32823,6 @@ echo "$as_me: error: conditional \"WANT_MPBSD\" was never defined.
 Usually this means the macro was only invoked conditionally." >&2;}
    { (exit 1); exit 1; }; }
 fi
-if test -z "${WANT_MPFR_TRUE}" && test -z "${WANT_MPFR_FALSE}"; then
-  { { echo "$as_me:$LINENO: error: conditional \"WANT_MPFR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&5
-echo "$as_me: error: conditional \"WANT_MPFR\" was never defined.
-Usually this means the macro was only invoked conditionally." >&2;}
-   { (exit 1); exit 1; }; }
-fi
 if test -z "${WANT_CXX_TRUE}" && test -z "${WANT_CXX_FALSE}"; then
   { { echo "$as_me:$LINENO: error: conditional \"WANT_CXX\" was never defined.
 Usually this means the macro was only invoked conditionally." >&5
@@ -34990,8 +33296,6 @@ do
   "tests/rand/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/rand/Makefile" ;;
   "tests/misc/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/misc/Makefile" ;;
   "tests/cxx/Makefile" ) CONFIG_FILES="$CONFIG_FILES tests/cxx/Makefile" ;;
-  "mpfr/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpfr/Makefile" ;;
-  "mpfr/tests/Makefile" ) CONFIG_FILES="$CONFIG_FILES mpfr/tests/Makefile" ;;
   "doc/Makefile" ) CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
   "tune/Makefile" ) CONFIG_FILES="$CONFIG_FILES tune/Makefile" ;;
   "demos/Makefile" ) CONFIG_FILES="$CONFIG_FILES demos/Makefile" ;;
@@ -35120,8 +33424,6 @@ s,@MAINTAINER_MODE_FALSE@,$MAINTAINER_MODE_FALSE,;t t
 s,@MAINT@,$MAINT,;t t
 s,@WANT_MPBSD_TRUE@,$WANT_MPBSD_TRUE,;t t
 s,@WANT_MPBSD_FALSE@,$WANT_MPBSD_FALSE,;t t
-s,@WANT_MPFR_TRUE@,$WANT_MPFR_TRUE,;t t
-s,@WANT_MPFR_FALSE@,$WANT_MPFR_FALSE,;t t
 s,@GMP_NAIL_BITS@,$GMP_NAIL_BITS,;t t
 s,@ABI@,$ABI,;t t
 s,@HAVE_HOST_CPU_FAMILY_power@,$HAVE_HOST_CPU_FAMILY_power,;t t
@@ -35179,11 +33481,6 @@ 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,@MPFR_LIBM@,$MPFR_LIBM,;t t
-s,@TESTS_ASM_OBJECTS@,$TESTS_ASM_OBJECTS,;t t
-s,@LIBOBJS@,$LIBOBJS,;t t
-s,@MPFR_CFLAGS@,$MPFR_CFLAGS,;t t
-s,@MPFR_LIBS@,$MPFR_LIBS,;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
@@ -35201,8 +33498,8 @@ s,@YACC@,$YACC,;t t
 s,@LEX@,$LEX,;t t
 s,@LEXLIB@,$LEXLIB,;t t
 s,@LEX_OUTPUT_ROOT@,$LEX_OUTPUT_ROOT,;t t
-s,@HAVE_MPFR_01@,$HAVE_MPFR_01,;t t
 s,@HAVE_DECL_OPTARG@,$HAVE_DECL_OPTARG,;t t
+s,@LIBOBJS@,$LIBOBJS,;t t
 s,@LTLIBOBJS@,$LTLIBOBJS,;t t
 CEOF
 
diff --git a/cxx/Makefile.in b/cxx/Makefile.in
index 57fb8f1e7..f4c152b5d 100644
--- a/cxx/Makefile.in
+++ b/cxx/Makefile.in
@@ -60,8 +60,8 @@ ANSI2KNR = $(top_builddir)/ansi2knr
 subdir = cxx
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -131,7 +131,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -162,9 +161,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -180,7 +176,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -189,8 +184,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/demos/Makefile.in b/demos/Makefile.in
index 5bafa126d..03e4639a5 100644
--- a/demos/Makefile.in
+++ b/demos/Makefile.in
@@ -62,8 +62,8 @@ subdir = demos
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/pexpr-config-h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -155,7 +155,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -186,9 +185,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -204,7 +200,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -213,8 +208,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/demos/calc/Makefile.in b/demos/calc/Makefile.in
index c6c0fffd5..0310b6efc 100644
--- a/demos/calc/Makefile.in
+++ b/demos/calc/Makefile.in
@@ -61,8 +61,8 @@ subdir = demos/calc
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/calc-config-h.in calc.c calc.h calclex.c
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -139,7 +139,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -170,9 +169,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -188,7 +184,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -197,8 +192,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/demos/expr/Makefile.in b/demos/expr/Makefile.in
index 020224605..67c08280f 100644
--- a/demos/expr/Makefile.in
+++ b/demos/expr/Makefile.in
@@ -14,7 +14,7 @@
 
 @SET_MAKE@
 
-# Copyright 2001, 2002, 2003 Free Software Foundation, Inc.
+# Copyright 2001, 2002, 2003, 2004 Free Software Foundation, Inc.
 #
 # This file is part of the GNU MP Library.
 #
@@ -61,8 +61,8 @@ subdir = demos/expr
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
 	$(srcdir)/expr-config-h.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -70,27 +70,19 @@ CONFIG_HEADER = $(top_builddir)/config.h
 CONFIG_CLEAN_FILES = expr-config.h
 libexpr_a_AR = $(AR) $(ARFLAGS)
 libexpr_a_LIBADD =
-am__libexpr_a_SOURCES_DIST = expr.h expr-impl.h expr.c exprv.c exprz.c \
-	exprza.c exprq.c exprqa.c exprf.c exprfa.c exprfr.c exprfra.c
-@WANT_MPFR_TRUE@am__objects_1 = exprfr$U.$(OBJEXT) exprfra$U.$(OBJEXT)
 am_libexpr_a_OBJECTS = expr$U.$(OBJEXT) exprv$U.$(OBJEXT) \
 	exprz$U.$(OBJEXT) exprza$U.$(OBJEXT) exprq$U.$(OBJEXT) \
-	exprqa$U.$(OBJEXT) exprf$U.$(OBJEXT) exprfa$U.$(OBJEXT) \
-	$(am__objects_1)
+	exprqa$U.$(OBJEXT) exprf$U.$(OBJEXT) exprfa$U.$(OBJEXT)
 libexpr_a_OBJECTS = $(am_libexpr_a_OBJECTS)
 run_expr_SOURCES = run-expr.c
 run_expr_OBJECTS = run-expr$U.$(OBJEXT)
 run_expr_LDADD = $(LDADD)
-@WANT_MPFR_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/mpfr/libmpfr.a
-am__DEPENDENCIES_2 =
-run_expr_DEPENDENCIES = libexpr.a $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la $(am__DEPENDENCIES_2)
+run_expr_DEPENDENCIES = libexpr.a $(top_builddir)/libgmp.la
 t_expr_SOURCES = t-expr.c
 t_expr_OBJECTS = t-expr$U.$(OBJEXT)
-am__DEPENDENCIES_3 = libexpr.a $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la $(am__DEPENDENCIES_2)
+am__DEPENDENCIES_1 = libexpr.a $(top_builddir)/libgmp.la
 t_expr_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(am__DEPENDENCIES_3)
+	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -103,7 +95,7 @@ CCLD = $(CC)
 LINK = $(LIBTOOL) --mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(libexpr_a_SOURCES) run-expr.c t-expr.c
-DIST_SOURCES = $(am__libexpr_a_SOURCES_DIST) run-expr.c t-expr.c
+DIST_SOURCES = $(libexpr_a_SOURCES) run-expr.c t-expr.c
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -150,7 +142,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -181,9 +172,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -199,7 +187,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -208,8 +195,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
@@ -253,18 +238,12 @@ sbindir = @sbindir@
 sharedstatedir = @sharedstatedir@
 sysconfdir = @sysconfdir@
 target_alias = @target_alias@
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests -I$(top_srcdir)/mpfr
-@WANT_MPFR_TRUE@MPFR_SOURCES_OPTION = exprfr.c exprfra.c
-@WANT_MPFR_TRUE@MPFR_LIBADD_OPTION = $(top_builddir)/mpfr/libmpfr.a
-
-# ensure these are always distributed
-EXTRA_DIST = exprfr.c exprfra.c
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
 EXTRA_LIBRARIES = libexpr.a
 libexpr_a_SOURCES = expr.h expr-impl.h \
-  expr.c exprv.c exprz.c exprza.c exprq.c exprqa.c exprf.c exprfa.c \
-  $(MPFR_SOURCES_OPTION)
+  expr.c exprv.c exprz.c exprza.c exprq.c exprqa.c exprf.c exprfa.c
 
-LDADD = libexpr.a $(MPFR_LIBADD_OPTION) $(top_builddir)/libgmp.la $(LIBM)
+LDADD = libexpr.a $(top_builddir)/libgmp.la
 t_expr_LDADD = $(top_builddir)/tests/libtests.la $(LDADD)
 CLEANFILES = $(EXTRA_PROGRAMS) $(EXTRA_LIBRARIES)
 all: all-am
@@ -338,10 +317,6 @@ exprf_.c: exprf.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/exprf.c; then echo $(srcdir)/exprf.c; else echo exprf.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 exprfa_.c: exprfa.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/exprfa.c; then echo $(srcdir)/exprfa.c; else echo exprfa.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-exprfr_.c: exprfr.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/exprfr.c; then echo $(srcdir)/exprfr.c; else echo exprfr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
-exprfra_.c: exprfra.c $(ANSI2KNR)
-	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/exprfra.c; then echo $(srcdir)/exprfra.c; else echo exprfra.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 exprq_.c: exprq.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/exprq.c; then echo $(srcdir)/exprq.c; else echo exprq.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 exprqa_.c: exprqa.c $(ANSI2KNR)
@@ -357,8 +332,7 @@ run-expr_.c: run-expr.c $(ANSI2KNR)
 t-expr_.c: t-expr.c $(ANSI2KNR)
 	$(CPP) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) `if test -f $(srcdir)/t-expr.c; then echo $(srcdir)/t-expr.c; else echo t-expr.c; fi` | sed 's/^# \([0-9]\)/#line \1/' | $(ANSI2KNR) > $@ || rm -f $@
 expr_.$(OBJEXT) expr_.lo exprf_.$(OBJEXT) exprf_.lo exprfa_.$(OBJEXT) \
-exprfa_.lo exprfr_.$(OBJEXT) exprfr_.lo exprfra_.$(OBJEXT) exprfra_.lo \
-exprq_.$(OBJEXT) exprq_.lo exprqa_.$(OBJEXT) exprqa_.lo \
+exprfa_.lo exprq_.$(OBJEXT) exprq_.lo exprqa_.$(OBJEXT) exprqa_.lo \
 exprv_.$(OBJEXT) exprv_.lo exprz_.$(OBJEXT) exprz_.lo \
 exprza_.$(OBJEXT) exprza_.lo run-expr_.$(OBJEXT) run-expr_.lo \
 t-expr_.$(OBJEXT) t-expr_.lo : $(ANSI2KNR)
diff --git a/doc/Makefile.in b/doc/Makefile.in
index 0ce41f14b..e8caeec31 100644
--- a/doc/Makefile.in
+++ b/doc/Makefile.in
@@ -58,8 +58,8 @@ DIST_COMMON = $(gmp_TEXINFOS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in $(srcdir)/stamp-vti \
 	$(srcdir)/version.texi mdate-sh texinfo.tex
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -126,7 +126,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -157,9 +156,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -175,7 +171,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -184,8 +179,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/mpbsd/Makefile.in b/mpbsd/Makefile.in
index 11c58729c..77bcce6f3 100644
--- a/mpbsd/Makefile.in
+++ b/mpbsd/Makefile.in
@@ -60,8 +60,8 @@ ANSI2KNR = $(top_builddir)/ansi2knr
 subdir = mpbsd
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -133,7 +133,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -164,9 +163,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -182,7 +178,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -191,8 +186,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/mpf/Makefile.in b/mpf/Makefile.in
index c68d731d5..0b652b396 100644
--- a/mpf/Makefile.in
+++ b/mpf/Makefile.in
@@ -61,8 +61,8 @@ ANSI2KNR = $(top_builddir)/ansi2knr
 subdir = mpf
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -144,7 +144,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -175,9 +174,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -193,7 +189,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -202,8 +197,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/mpn/Makefile.in b/mpn/Makefile.in
index 42d7abe71..c498153e6 100644
--- a/mpn/Makefile.in
+++ b/mpn/Makefile.in
@@ -82,8 +82,8 @@ DIST_COMMON = README $(srcdir)/Makeasm.am $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in
 subdir = mpn
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -153,7 +153,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -184,9 +183,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -202,7 +198,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -211,8 +206,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/mpq/Makefile.in b/mpq/Makefile.in
index d23413148..9b259c9a9 100644
--- a/mpq/Makefile.in
+++ b/mpq/Makefile.in
@@ -60,8 +60,8 @@ ANSI2KNR = $(top_builddir)/ansi2knr
 subdir = mpq
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -136,7 +136,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -167,9 +166,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -185,7 +181,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -194,8 +189,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/mpz/Makefile.in b/mpz/Makefile.in
index d3bcb7195..bc30ccfa5 100644
--- a/mpz/Makefile.in
+++ b/mpz/Makefile.in
@@ -61,8 +61,8 @@ ANSI2KNR = $(top_builddir)/ansi2knr
 subdir = mpz
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -164,7 +164,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -195,9 +194,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -213,7 +209,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -222,8 +217,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/printf/Makefile.in b/printf/Makefile.in
index 0b1e91e47..b7f555de5 100644
--- a/printf/Makefile.in
+++ b/printf/Makefile.in
@@ -60,8 +60,8 @@ ANSI2KNR = $(top_builddir)/ansi2knr
 subdir = printf
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -135,7 +135,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -166,9 +165,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -184,7 +180,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -193,8 +188,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/scanf/Makefile.in b/scanf/Makefile.in
index 478c84fea..06113ba69 100644
--- a/scanf/Makefile.in
+++ b/scanf/Makefile.in
@@ -60,8 +60,8 @@ ANSI2KNR = $(top_builddir)/ansi2knr
 subdir = scanf
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -132,7 +132,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -163,9 +162,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -181,7 +177,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -190,8 +185,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 9f92d64b8..fca58ac66 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -84,8 +84,8 @@ check_PROGRAMS = t-bswap$(EXEEXT) t-constants$(EXEEXT) \
 	t-sub$(EXEEXT)
 subdir = tests
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -201,7 +201,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -232,9 +231,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -250,7 +246,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -259,8 +254,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/tests/cxx/Makefile.in b/tests/cxx/Makefile.in
index 9af4adc59..33b57b102 100644
--- a/tests/cxx/Makefile.in
+++ b/tests/cxx/Makefile.in
@@ -32,7 +32,7 @@
 # along with the GNU MP Library; see the file COPYING.LIB.  If not, write to
 # the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston,
 # MA 02111-1307, USA.
-SOURCES = $(t_assign_SOURCES) $(t_binary_SOURCES) $(t_cast_SOURCES) $(t_constr_SOURCES) $(t_headers_SOURCES) $(t_headfr_SOURCES) $(t_istream_SOURCES) $(t_locale_SOURCES) $(t_misc_SOURCES) $(t_ops_SOURCES) $(t_ostream_SOURCES) $(t_prec_SOURCES) $(t_rand_SOURCES) $(t_ternary_SOURCES) $(t_unary_SOURCES)
+SOURCES = $(t_assign_SOURCES) $(t_binary_SOURCES) $(t_cast_SOURCES) $(t_constr_SOURCES) $(t_headers_SOURCES) $(t_istream_SOURCES) $(t_locale_SOURCES) $(t_misc_SOURCES) $(t_ops_SOURCES) $(t_ostream_SOURCES) $(t_prec_SOURCES) $(t_rand_SOURCES) $(t_ternary_SOURCES) $(t_unary_SOURCES)
 
 srcdir = @srcdir@
 top_srcdir = @top_srcdir@
@@ -58,17 +58,16 @@ host_triplet = @host@
 ANSI2KNR = $(top_builddir)/ansi2knr
 @WANT_CXX_TRUE@check_PROGRAMS = t-assign$(EXEEXT) t-binary$(EXEEXT) \
 @WANT_CXX_TRUE@	t-cast$(EXEEXT) t-constr$(EXEEXT) \
-@WANT_CXX_TRUE@	t-headers$(EXEEXT) t-headfr$(EXEEXT) \
-@WANT_CXX_TRUE@	t-istream$(EXEEXT) t-locale$(EXEEXT) \
-@WANT_CXX_TRUE@	t-misc$(EXEEXT) t-ops$(EXEEXT) \
-@WANT_CXX_TRUE@	t-ostream$(EXEEXT) t-prec$(EXEEXT) \
-@WANT_CXX_TRUE@	t-rand$(EXEEXT) t-ternary$(EXEEXT) \
-@WANT_CXX_TRUE@	t-unary$(EXEEXT)
+@WANT_CXX_TRUE@	t-headers$(EXEEXT) t-istream$(EXEEXT) \
+@WANT_CXX_TRUE@	t-locale$(EXEEXT) t-misc$(EXEEXT) \
+@WANT_CXX_TRUE@	t-ops$(EXEEXT) t-ostream$(EXEEXT) \
+@WANT_CXX_TRUE@	t-prec$(EXEEXT) t-rand$(EXEEXT) \
+@WANT_CXX_TRUE@	t-ternary$(EXEEXT) t-unary$(EXEEXT)
 subdir = tests/cxx
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -77,94 +76,73 @@ CONFIG_CLEAN_FILES =
 am_t_assign_OBJECTS = t-assign.$(OBJEXT)
 t_assign_OBJECTS = $(am_t_assign_OBJECTS)
 t_assign_LDADD = $(LDADD)
-@WANT_MPFR_TRUE@am__DEPENDENCIES_1 = $(top_builddir)/mpfr/libmpfr.a
 t_assign_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_binary_OBJECTS = t-binary.$(OBJEXT)
 t_binary_OBJECTS = $(am_t_binary_OBJECTS)
 t_binary_LDADD = $(LDADD)
 t_binary_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_cast_OBJECTS = t-cast.$(OBJEXT)
 t_cast_OBJECTS = $(am_t_cast_OBJECTS)
 t_cast_LDADD = $(LDADD)
 t_cast_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_constr_OBJECTS = t-constr.$(OBJEXT)
 t_constr_OBJECTS = $(am_t_constr_OBJECTS)
 t_constr_LDADD = $(LDADD)
 t_constr_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_headers_OBJECTS = t-headers.$(OBJEXT)
 t_headers_OBJECTS = $(am_t_headers_OBJECTS)
 t_headers_LDADD = $(LDADD)
 t_headers_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
-am_t_headfr_OBJECTS = t-headfr.$(OBJEXT)
-t_headfr_OBJECTS = $(am_t_headfr_OBJECTS)
-t_headfr_LDADD = $(LDADD)
-t_headfr_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_istream_OBJECTS = t-istream.$(OBJEXT)
 t_istream_OBJECTS = $(am_t_istream_OBJECTS)
 t_istream_LDADD = $(LDADD)
 t_istream_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_locale_OBJECTS = t-locale.$(OBJEXT) clocale$U.$(OBJEXT)
 t_locale_OBJECTS = $(am_t_locale_OBJECTS)
 t_locale_LDADD = $(LDADD)
 t_locale_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_misc_OBJECTS = t-misc.$(OBJEXT)
 t_misc_OBJECTS = $(am_t_misc_OBJECTS)
 t_misc_LDADD = $(LDADD)
 t_misc_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_ops_OBJECTS = t-ops.$(OBJEXT)
 t_ops_OBJECTS = $(am_t_ops_OBJECTS)
 t_ops_LDADD = $(LDADD)
 t_ops_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_ostream_OBJECTS = t-ostream.$(OBJEXT)
 t_ostream_OBJECTS = $(am_t_ostream_OBJECTS)
 t_ostream_LDADD = $(LDADD)
 t_ostream_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_prec_OBJECTS = t-prec.$(OBJEXT)
 t_prec_OBJECTS = $(am_t_prec_OBJECTS)
 t_prec_LDADD = $(LDADD)
 t_prec_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_rand_OBJECTS = t-rand.$(OBJEXT)
 t_rand_OBJECTS = $(am_t_rand_OBJECTS)
 t_rand_LDADD = $(LDADD)
 t_rand_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_ternary_OBJECTS = t-ternary.$(OBJEXT)
 t_ternary_OBJECTS = $(am_t_ternary_OBJECTS)
 t_ternary_LDADD = $(LDADD)
 t_ternary_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 am_t_unary_OBJECTS = t-unary.$(OBJEXT)
 t_unary_OBJECTS = $(am_t_unary_OBJECTS)
 t_unary_LDADD = $(LDADD)
 t_unary_DEPENDENCIES = $(top_builddir)/tests/libtests.la \
-	$(top_builddir)/libgmpxx.la $(am__DEPENDENCIES_1) \
-	$(top_builddir)/libgmp.la
+	$(top_builddir)/libgmpxx.la $(top_builddir)/libgmp.la
 DEFAULT_INCLUDES = -I. -I$(srcdir) -I$(top_builddir)
 depcomp =
 am__depfiles_maybe =
@@ -185,16 +163,15 @@ CXXLD = $(CXX)
 CXXLINK = $(LIBTOOL) --mode=link $(CXXLD) $(AM_CXXFLAGS) $(CXXFLAGS) \
 	$(AM_LDFLAGS) $(LDFLAGS) -o $@
 SOURCES = $(t_assign_SOURCES) $(t_binary_SOURCES) $(t_cast_SOURCES) \
-	$(t_constr_SOURCES) $(t_headers_SOURCES) $(t_headfr_SOURCES) \
+	$(t_constr_SOURCES) $(t_headers_SOURCES) $(t_istream_SOURCES) \
+	$(t_locale_SOURCES) $(t_misc_SOURCES) $(t_ops_SOURCES) \
+	$(t_ostream_SOURCES) $(t_prec_SOURCES) $(t_rand_SOURCES) \
+	$(t_ternary_SOURCES) $(t_unary_SOURCES)
+DIST_SOURCES = $(t_assign_SOURCES) $(t_binary_SOURCES) \
+	$(t_cast_SOURCES) $(t_constr_SOURCES) $(t_headers_SOURCES) \
 	$(t_istream_SOURCES) $(t_locale_SOURCES) $(t_misc_SOURCES) \
 	$(t_ops_SOURCES) $(t_ostream_SOURCES) $(t_prec_SOURCES) \
 	$(t_rand_SOURCES) $(t_ternary_SOURCES) $(t_unary_SOURCES)
-DIST_SOURCES = $(t_assign_SOURCES) $(t_binary_SOURCES) \
-	$(t_cast_SOURCES) $(t_constr_SOURCES) $(t_headers_SOURCES) \
-	$(t_headfr_SOURCES) $(t_istream_SOURCES) $(t_locale_SOURCES) \
-	$(t_misc_SOURCES) $(t_ops_SOURCES) $(t_ostream_SOURCES) \
-	$(t_prec_SOURCES) $(t_rand_SOURCES) $(t_ternary_SOURCES) \
-	$(t_unary_SOURCES)
 ETAGS = etags
 CTAGS = ctags
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -241,7 +218,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -272,9 +248,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -290,7 +263,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -299,8 +271,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
@@ -350,20 +320,18 @@ target_alias = @target_alias@
 # required by libgmpxx.sl (ie. in its NEEDED records) is not found by the
 # linker.  FIXME: Presumably libtool should do something about this itself.
 #
-INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests -I$(top_srcdir)/mpfr
+INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/tests
 LDADD = -L$(top_builddir)/.libs \
   $(top_builddir)/tests/libtests.la \
   $(top_builddir)/libgmpxx.la \
-  $(LIBMPFR) $(top_builddir)/libgmp.la
+  $(top_builddir)/libgmp.la
 
-@WANT_MPFR_TRUE@LIBMPFR = $(top_builddir)/mpfr/libmpfr.a
 @WANT_CXX_TRUE@TESTS = $(check_PROGRAMS)
 t_assign_SOURCES = t-assign.cc
 t_binary_SOURCES = t-binary.cc
 t_cast_SOURCES = t-cast.cc
 t_constr_SOURCES = t-constr.cc
 t_headers_SOURCES = t-headers.cc
-t_headfr_SOURCES = t-headfr.cc
 t_istream_SOURCES = t-istream.cc
 t_locale_SOURCES = t-locale.cc clocale.c
 t_misc_SOURCES = t-misc.cc
@@ -441,9 +409,6 @@ t-constr$(EXEEXT): $(t_constr_OBJECTS) $(t_constr_DEPENDENCIES)
 t-headers$(EXEEXT): $(t_headers_OBJECTS) $(t_headers_DEPENDENCIES) 
 	@rm -f t-headers$(EXEEXT)
 	$(CXXLINK) $(t_headers_LDFLAGS) $(t_headers_OBJECTS) $(t_headers_LDADD) $(LIBS)
-t-headfr$(EXEEXT): $(t_headfr_OBJECTS) $(t_headfr_DEPENDENCIES) 
-	@rm -f t-headfr$(EXEEXT)
-	$(CXXLINK) $(t_headfr_LDFLAGS) $(t_headfr_OBJECTS) $(t_headfr_LDADD) $(LIBS)
 t-istream$(EXEEXT): $(t_istream_OBJECTS) $(t_istream_DEPENDENCIES) 
 	@rm -f t-istream$(EXEEXT)
 	$(CXXLINK) $(t_istream_LDFLAGS) $(t_istream_OBJECTS) $(t_istream_LDADD) $(LIBS)
diff --git a/tests/devel/Makefile.in b/tests/devel/Makefile.in
index b8d704203..f29d63d55 100644
--- a/tests/devel/Makefile.in
+++ b/tests/devel/Makefile.in
@@ -63,8 +63,8 @@ EXTRA_PROGRAMS = add_n$(EXEEXT) addmul_1$(EXEEXT) copy$(EXEEXT) \
 subdir = tests/devel
 DIST_COMMON = README $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -191,7 +191,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -222,9 +221,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -240,7 +236,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -249,8 +244,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/tests/misc/Makefile.in b/tests/misc/Makefile.in
index a6cdfacf6..df66df46f 100644
--- a/tests/misc/Makefile.in
+++ b/tests/misc/Makefile.in
@@ -60,8 +60,8 @@ check_PROGRAMS = t-printf$(EXEEXT) t-scanf$(EXEEXT) t-locale$(EXEEXT)
 subdir = tests/misc
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -141,7 +141,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -172,9 +171,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -190,7 +186,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -199,8 +194,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/tests/mpbsd/Makefile.in b/tests/mpbsd/Makefile.in
index 810615993..72d56dc42 100644
--- a/tests/mpbsd/Makefile.in
+++ b/tests/mpbsd/Makefile.in
@@ -60,8 +60,8 @@ check_PROGRAMS = $(am__EXEEXT_1)
 subdir = tests/mpbsd
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -141,7 +141,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -172,9 +171,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -190,7 +186,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -199,8 +194,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/tests/mpf/Makefile.in b/tests/mpf/Makefile.in
index d4d8dc902..6813d4f58 100644
--- a/tests/mpf/Makefile.in
+++ b/tests/mpf/Makefile.in
@@ -69,8 +69,8 @@ check_PROGRAMS = t-add$(EXEEXT) t-sub$(EXEEXT) t-conv$(EXEEXT) \
 subdir = tests/mpf
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -273,7 +273,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -304,9 +303,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -322,7 +318,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -331,8 +326,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/tests/mpn/Makefile.in b/tests/mpn/Makefile.in
index 32a7df24b..c1ffd0a66 100644
--- a/tests/mpn/Makefile.in
+++ b/tests/mpn/Makefile.in
@@ -63,8 +63,8 @@ check_PROGRAMS = t-asmtype$(EXEEXT) t-aors_1$(EXEEXT) \
 subdir = tests/mpn
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -188,7 +188,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -219,9 +218,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -237,7 +233,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -246,8 +241,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/tests/mpq/Makefile.in b/tests/mpq/Makefile.in
index 762a79fbd..cd8d7ed60 100644
--- a/tests/mpq/Makefile.in
+++ b/tests/mpq/Makefile.in
@@ -63,8 +63,8 @@ check_PROGRAMS = t-aors$(EXEEXT) t-cmp$(EXEEXT) t-cmp_ui$(EXEEXT) \
 subdir = tests/mpq
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -187,7 +187,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -218,9 +217,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -236,7 +232,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -245,8 +240,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/tests/mpz/Makefile.in b/tests/mpz/Makefile.in
index 22963a1c7..a2d1b6d5e 100644
--- a/tests/mpz/Makefile.in
+++ b/tests/mpz/Makefile.in
@@ -78,8 +78,8 @@ check_PROGRAMS = t-addsub$(EXEEXT) t-cmp$(EXEEXT) t-mul$(EXEEXT) \
 subdir = tests/mpz
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -444,7 +444,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -475,9 +474,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -493,7 +489,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -502,8 +497,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/tests/rand/Makefile.in b/tests/rand/Makefile.in
index 073ee7dd7..724253568 100644
--- a/tests/rand/Makefile.in
+++ b/tests/rand/Makefile.in
@@ -64,8 +64,8 @@ EXTRA_PROGRAMS = findlc$(EXEEXT) gen$(EXEEXT) gen.static$(EXEEXT) \
 subdir = tests/rand
 DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -193,7 +193,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -224,9 +223,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -242,7 +238,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -251,8 +246,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
diff --git a/tune/Makefile.in b/tune/Makefile.in
index 515aab9aa..496ca5d64 100644
--- a/tune/Makefile.in
+++ b/tune/Makefile.in
@@ -83,8 +83,8 @@ DIST_COMMON = README $(noinst_HEADERS) $(srcdir)/../mpn/Makeasm.am \
 	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
 subdir = tune
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/mpfr/acinclude.m4 \
-	$(top_srcdir)/acinclude.m4 $(top_srcdir)/configure.in
+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(mkdir_p)
@@ -189,7 +189,6 @@ HAVE_GETRUSAGE_01 = @HAVE_GETRUSAGE_01@
 HAVE_GETTIMEOFDAY_01 = @HAVE_GETTIMEOFDAY_01@
 HAVE_HOST_CPU_FAMILY_power = @HAVE_HOST_CPU_FAMILY_power@
 HAVE_HOST_CPU_FAMILY_powerpc = @HAVE_HOST_CPU_FAMILY_powerpc@
-HAVE_MPFR_01 = @HAVE_MPFR_01@
 HAVE_SIGACTION_01 = @HAVE_SIGACTION_01@
 HAVE_SIGALTSTACK_01 = @HAVE_SIGALTSTACK_01@
 HAVE_SIGSTACK_01 = @HAVE_SIGSTACK_01@
@@ -220,9 +219,6 @@ MAINT = @MAINT@
 MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
 MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
 MAKEINFO = @MAKEINFO@
-MPFR_CFLAGS = @MPFR_CFLAGS@
-MPFR_LIBM = @MPFR_LIBM@
-MPFR_LIBS = @MPFR_LIBS@
 OBJDUMP = @OBJDUMP@
 OBJEXT = @OBJEXT@
 PACKAGE = @PACKAGE@
@@ -238,7 +234,6 @@ SHELL = @SHELL@
 SPEED_CYCLECOUNTER_OBJ = @SPEED_CYCLECOUNTER_OBJ@
 STRIP = @STRIP@
 TAL_OBJECT = @TAL_OBJECT@
-TESTS_ASM_OBJECTS = @TESTS_ASM_OBJECTS@
 TUNE_SQR_OBJ = @TUNE_SQR_OBJ@
 U = @U@
 U_FOR_BUILD = @U_FOR_BUILD@
@@ -247,8 +242,6 @@ WANT_CXX_FALSE = @WANT_CXX_FALSE@
 WANT_CXX_TRUE = @WANT_CXX_TRUE@
 WANT_MPBSD_FALSE = @WANT_MPBSD_FALSE@
 WANT_MPBSD_TRUE = @WANT_MPBSD_TRUE@
-WANT_MPFR_FALSE = @WANT_MPFR_FALSE@
-WANT_MPFR_TRUE = @WANT_MPFR_TRUE@
 WITH_READLINE_01 = @WITH_READLINE_01@
 YACC = @YACC@
 ac_ct_AR = @ac_ct_AR@
author	Kevin Ryde <user42@zip.com.au>	2004-05-08 02:41:53 +0200
committer	Kevin Ryde <user42@zip.com.au>	2004-05-08 02:41:53 +0200
commit	7d9d51bd70d055a28adc87ebecf7c8916fb6b154 (patch)
tree	0386b683dc2b56dae3c732363b798b9483b83322
parent	5941deb095d8916e793cfc5bda7002c2871cb887 (diff)
download	gmp-7d9d51bd70d055a28adc87ebecf7c8916fb6b154.tar.gz