corrected rebase

build/pkgs/flint/spkg-configure.m4

@@ -13,7 +13,7 @@ dnl Just part the options here
         *)
             AC_MSG_ERROR([allowed values for --with-flint are system and install]);;
     esac
-   
+
     case "$with_flint" in
         system)
                AC_CHECK_HEADER(flint/flint.h, [

src/bin/sage-env-config.in

@@ -77,29 +77,12 @@ if [ -n "$SAGE_NTL_PREFIX" ]; then
     # SAGE_LOCAL it is useful to pass it.
     export SAGE_CONFIGURE_NTL="--with-ntl=$SAGE_NTL_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-gmp=$SAGE_MPFR_PREFIX"
-fi
-
-# The MPC case is very close to the MPFR case above
-# This is usually blank if the system MPC is used, or $SAGE_LOCAL otherwise
-export SAGE_MPC_PREFIX="@SAGE_MPC_PREFIX@"
-if [ -n "$SAGE_MPC_PREFIX" ]; then
-    # Some packages that depend on MPC accept a --with-mpc=<prefix> flag to
-    # their ./configure scripts. Thus we deal with this just as with GMP above. 
-    export SAGE_CONFIGURE_MPC="--with-mpc=$SAGE_MPC_PREFIX"
-fi
 
 # The FLINT case is very close to the MPFR case above
 # This is usually blank if the system FLINT is used, or $SAGE_LOCAL otherwise
 export SAGE_FLINT_PREFIX="@SAGE_FLINT_PREFIX@"
 if [ -n "$SAGE_FLINT_PREFIX" ]; then
     # Some packages that depend on FLINT accept a --with-flint=<prefix> flag to
-    # their ./configure scripts. Thus we deal with this just as with GMP above. 
+    # their ./configure scripts. Thus we deal with this just as with GMP above.
     export SAGE_CONFIGURE_FLINT="--with-flint=$SAGE_FLINT_PREFIX"
 fi