* Makefile.am, configure.in: Temporarily remove mpfr, just leave a

	README.

2 files changed, 20 insertions, 14 deletions

diff --git a/Makefile.am b/Makefile.am
index dca8fb006..2e7227827 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,17 +63,21 @@ LIBMP_LT_AGE =      1
 
 AUTOMAKE_OPTIONS = gnu no-dependencies ansi2knr
 
-# 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".
-if WANT_MPFR
-MPFR_DIR = mpfr
-else
-if MAINTAINER_MODE
-MPFR_DIR = mpfr
-endif
-endif
+# mpfr temporarily removed from the distribution
+MPFR_DIR =
+#
+# # 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".
+# if WANT_MPFR
+# MPFR_DIR = mpfr
+# else
+# if MAINTAINER_MODE
+# MPFR_DIR = mpfr
+# endif
+# endif
+
 
 # "tests" ahead of "mpfr" ensures tests/t-constants is run before the
 # mpfr/tests programs.
@@ -92,7 +96,7 @@ lib_LTLIBRARIES = libgmp.la $(GMPXX_LTLIBRARIES_OPTION) $(MPBSD_LTLIBRARIES_OPTI
 
 EXTRA_DIST = doc macos \
   configfsf.guess configfsf.sub .gdbinit INSTALL.autoconf libmp.sym \
-  gmpxx.h mpfrxx.h
+  gmpxx.h mpfrxx.h mpfr/README
 
 DISTCLEANFILES = $(nodist_include_HEADERS) config.m4 @gmp_srclinks@
 
diff --git a/configure.in b/configure.in
index 7fd9e320b..44b11169f 100644
--- a/configure.in
+++ b/configure.in
@@ -1717,9 +1717,8 @@ GMP_FINISH
 #        Right now automake isn't accepting the new AC_CONFIG_FILES scheme.
 
 AC_OUTPUT(Makefile							\
-  mpbsd/Makefile mpf/Makefile mpfr/Makefile mpn/Makefile mpq/Makefile	\
+  mpbsd/Makefile mpf/Makefile mpn/Makefile mpq/Makefile	\
   mpz/Makefile printf/Makefile scanf/Makefile cxx/Makefile		\
-  mpfr/tests/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		\
@@ -1728,3 +1727,6 @@ AC_OUTPUT(Makefile							\
   demos/Makefile demos/calc/Makefile demos/expr/Makefile		\
   gmp.h:gmp-h.in mp.h:mp-h.in						\
   demos/expr/expr-impl.h:demos/expr/expr-impl-h.in)
+
+dnl  mpfr temporarily removed from the distribution
+dnl  mpfr/Makefile mpfr/tests/Makefile