update for Sage 8.7.rc0, a typo fix

build/pkgs/arb/spkg-install

@@ -5,7 +5,7 @@ cd src
 export EXTRA_SHARED_FLAGS=$LDFLAGS
 
 ./configure --disable-static --prefix="$SAGE_LOCAL" $SAGE_CONFIGURE_GMP \
-            --with-flint="$SAGE_LOCAL" --with-mpfr="$SAGE_LOCAL" || \
+            --with-flint="$SAGE_LOCAL" $SAGE_CONFIGURE_MPFR || \
     sdh_die "Error configuring arb."
 
 sdh_make verbose

build/pkgs/deformation/spkg-install

@@ -3,7 +3,7 @@ cd src
 # Note: Not actually an autoconf-generated configure; doesn't support
 # all standard flags, so we can't use sdh_configure
 ./configure --prefix="$SAGE_LOCAL" --disable-static \
-            $SAGE_CONFIGURE_GMP --with-mpfr="$SAGE_LOCAL" \
+            $SAGE_CONFIGURE_GMP $SAGE_CONFIGURE_MPFR \
             --with-flint="$SAGE_LOCAL" || \
             sdh_die "Failed to configure deformation"
 sdh_make

build/pkgs/flint/spkg-install

@@ -17,7 +17,7 @@ echo "Configuring FLINT."
     --disable-static \
     --prefix="$SAGE_LOCAL" \
     $SAGE_CONFIGURE_GMP \
-    --with-mpfr="$SAGE_LOCAL" \
+    $SAGE_CONFIGURE_MPFR \
     --with-ntl="$SAGE_LOCAL" \
     $FLINT_CONFIGURE || sdh_die "Error: Failed to configure FLINT."
 

build/pkgs/gdb/spkg-install

@@ -5,7 +5,7 @@ export LDFLAGS="${LDFLAGS} -L${SAGE_LOCAL}/lib -ltinfo"
 
 sdh_configure \
     --with-mpc="$SAGE_LOCAL" \
-    --with-mpfr="$SAGE_LOCAL" \
+    $SAGE_CONFIGURE_MPFR \
     $SAGE_CONFIGURE_GMP
 sdh_make
 sdh_make_install

build/pkgs/mpc/spkg-install

@@ -13,7 +13,7 @@ if [ $UNAME = "CYGWIN" ]; then
 fi
 
 # Building
-sdh_configure $SAGE_CONFIGURE_GMP --with-mpfr="$SAGE_LOCAL" $EXTRA
+sdh_configure $SAGE_CONFIGURE_GMP $SAGE_CONFIGURE_MPFR $EXTRA
 sdh_make
 
 # Cleaning

build/pkgs/mpfi/spkg-install

@@ -5,7 +5,7 @@ cd src
 # Use newer version of config.guess and config.sub (see Trac #19716)
 cp "$SAGE_ROOT"/config/config.* .
 
-sdh_configure --with-mpfr="$SAGE_LOCAL" $SAGE_CONFIGURE_GMP
+sdh_configure $SAGE_CONFIGURE_MPFR $SAGE_CONFIGURE_GMP
 sdh_make
 sdh_make_install
 

build/pkgs/mpfr/spkg-configure.m4

@@ -0,0 +1,50 @@
+SAGE_SPKG_CONFIGURE([mpfr], [
+    AC_ARG_WITH([mpfr],
+    [AS_HELP_STRING([--with-mpfr=system],
+        [use the system MPFR, if possible (default)])]
+    [AS_HELP_STRING([--with-mpfr=install],
+        [use the Sage SPKG for MPFR])])
+
+dnl Just part the options here
+    case "$with_mpfr" in
+        system) ;;
+        install) ;;
+        "") with_mpfr=system;;
+        *)
+            AC_MSG_ERROR([allowed values for --with-mpfr are system and install]);;
+    esac
+    
+    case "$with_mpfr" in
+        system)
+            AC_CHECK_HEADER(mpfr.h, [], [sage_spkg_install_mpfr=yes])
+        dnl mpfr_free_pool appeared in r11922 (Dec 2017) on MPFR svn 
+            AC_SEARCH_LIBS([mpfr_free_pool], [mpfr], [break], [sage_spkg_install_mpfr=yes])
+
+            if test x$sage_spkg_install_mpfr = xyes; then
+               AC_SUBST(SAGE_MPFR_PREFIX, ['$SAGE_LOCAL'])
+           dnl AC_SUBST(SAGE_MPFR_INCLUDE, ['$SAGE_LOCAL/include']) --- not used
+               AC_MSG_RESULT([using Sage's mpfr SPKG])
+            else
+           dnl If found, we want to get the absolute path to where we
+           dnl found it for use with some packages want
+           dnl this information at configure time
+               AX_ABSOLUTE_HEADER([mpfr.h])
+               if test x$gl_cv_absolute_mpfr_h = x; then
+                   AC_MSG_ERROR(m4_normalize([
+                     failed to find absolute path to mpfr.h despite it being reported found
+                   ]))
+               fi
+           dnl AC_SUBST(SAGE_MPFR_INCLUDE, [`AS_DIRNAME($gl_cv_absolute_mpfr_h)`])
+               AC_SUBST(SAGE_MPFR_PREFIX, [''])
+               AC_MSG_RESULT([using mpfr library from the system])
+            fi
+            ;;
+        install)
+            sage_spkg_install_mpfr=yes
+            AC_SUBST(SAGE_MPFR_PREFIX, ['$SAGE_LOCAL'])
+        dnl AC_SUBST(SAGE_MPFR_INCLUDE, ['$SAGE_LOCAL/include'])
+            AC_MSG_RESULT([using Sage's mpfr SPKG])
+            ;;
+    esac
+
+])

build/pkgs/mpfrcx/spkg-install

@@ -1,6 +1,6 @@
 cd src
 
-sdh_configure $SAGE_CONFIGURE_GMP --with-mpfr="$SAGE_LOCAL" \
+sdh_configure $SAGE_CONFIGURE_GMP $SAGE_CONFIGURE_MPFR \
               --with-mpc="$SAGE_LOCAL" --disable-static --enable-shared
 sdh_make
 sdh_make_install

src/bin/sage-env-config.in

@@ -49,3 +49,12 @@ if [ -n "$SAGE_GMP_PREFIX" ]; then
     # --with-gmp without an argument is actually a bug)
     export SAGE_CONFIGURE_GMP="--with-gmp=$SAGE_GMP_PREFIX"
 fi
+
+# The MPFR case is very close to the GMP case above
+# This is usually blank if the system MPFR is used, or $SAGE_LOCAL otherwise
+export SAGE_MPFR_PREFIX="@SAGE_MPFR_PREFIX@"
+if [ -n "$SAGE_MPFR_PREFIX" ]; then
+    # Some packages that depend on MPFR accept a --with-mpfr=<prefix> flag to
+    # their ./configure scripts. Thus we deal with this just as with GMP above. 
+    export SAGE_CONFIGURE_MPFR="--with-mpfr=$SAGE_MPFR_PREFIX"
+fi