X-Git-Url: https://gitweb.michael.orlitzky.com/?a=blobdiff_plain;f=sage.sh;h=57db823f6a8cef5ba6c03ad30b281ad42deca862;hb=7d7f3afc652a846cd43a96b977b545cac68de331;hp=c6c016977e9dcd0d70651118ddb723146e725d88;hpb=c1fad98898546bd38673d1c364cb54decce7d9fd;p=bash.d.git

diff --git a/sage.sh b/sage.sh
index c6c0169..57db823 100644
--- a/sage.sh
+++ b/sage.sh
@@ -8,6 +8,13 @@ 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}"
+}
+
 # Run ./configure within the SageMath git repository. This tweaks all
 # of the flags that I don't want to tweak manually:
 #
@@ -21,7 +28,10 @@ export SAGE_DEBUG=no
 #   * --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() {
+  ac_cv_path_NINJA=$(_sage_find_ninja) \
   ./configure \
     --enable-download-from-upstream-url \
     --enable-system-site-packages \
@@ -48,7 +58,7 @@ sage-configure() {
     --with-system-cppy=force \
     --with-system-curl=force \
     --with-system-cycler=force \
-    --with-system-cypari2=force \
+    --with-system-cypari=force \
     --with-system-cysignals=force \
     --with-system-cython=force \
     --with-system-dateutil=force \
@@ -83,6 +93,8 @@ sage-configure() {
     --with-system-idna=force \
     --with-system-iml=force \
     --with-system-importlib_metadata=force \
+    --with-system-ipython=force \
+    --with-system-ipywidgets=force \
     --with-system-isl=force \
     --with-system-jedi=force \
     --with-system-jinja2=force \
@@ -138,6 +150,8 @@ sage-configure() {
     --with-system-primecount=force \
     --with-system-primecountpy=force \
     --with-system-primesieve=force \
+    --with-system-prompt_toolkit=force \
+    --with-system-ptyprocess=force \
     --with-system-pure_eval=force \
     --with-system-pybind11=force \
     --with-system-pygments=force \