X-Git-Url: http://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=sage.sh;h=b5df79f20339f1e9c96669ce136011e7d87c2a21;hb=c0395db617e2095f5bb2d0c2a75225e16fd5da6f;hp=7ebc70279b1d9d3168b05c23db740eb55cca4f95;hpb=eec3e52e4764bdf9cbed2ca29cc01ada2774421a;p=bash.d.git

diff --git a/sage.sh b/sage.sh
index 7ebc702..b5df79f 100644
--- a/sage.sh
+++ b/sage.sh
@@ -8,19 +8,6 @@ export SAGE_INSTALL_GCC=no
 # This is trinary, ha ha!
 export SAGE_DEBUG=no
 
-# Print the path to either ninja (default) or samurai (if set via
-# $NINJA).
-_sage_find_ninja(){
-  [ -z "${NINJA}" ] && NINJA=ninja
-  command -v "${NINJA}"
-}
-
-# We have to export this because sage likes to re-bootstrap and
-# re-configure itself every time you change a comment in an m4 file,
-# and it won't re-configure with this variable set. So then after
-# five minutes you'll get an error from --with-system-ninja=force.
-export ac_cv_path_NINJA=$(_sage_find_ninja)
-
 # Run ./configure within the SageMath git repository. This tweaks all
 # of the flags that I don't want to tweak manually:
 #
@@ -34,8 +21,6 @@ export ac_cv_path_NINJA=$(_sage_find_ninja)
 #   * --with-system-foo=force: ensure that the system packages I have
 #                              installed are actually used.
 #
-# We also override the autoconf variable used to detect ninja, because
-# it does a version check that isn't compatible with samurai.
 sage-configure() {
   ./configure \
     --enable-download-from-upstream-url \
@@ -45,10 +30,8 @@ sage-configure() {
     --disable-doc \
     --disable-notebook \
     --disable-r \
-    --with-system-arb=force \
     --with-system-asttokens=force \
     --with-system-attrs=force \
-    --with-system-backcall=force \
     --with-system-beniget=force \
     --with-system-boost_cropped=force \
     --with-system-brial=force \
@@ -60,6 +43,7 @@ sage-configure() {
     --with-system-cliquer=force \
     --with-system-cmake=force \
     --with-system-contourpy=force \
+    --with-system-conway_polynomials=force \
     --with-system-cppy=force \
     --with-system-curl=force \
     --with-system-cycler=force \