sage.sh: force gengetopt and lcalc to come from the system.

[bash.d.git] / sage.sh

diff --git a/sage.sh b/sage.sh
index 4b87db06e87fa134a1c4aebe9ddb7e94b49da117..4a517d982d99ad6b5a63e104b48384fd89870331 100644 (file)
--- a/sage.sh
+++ b/sage.sh
@@ -17,9 +17,6 @@ export SAGE_DEBUG=no
 #   * --with-system-foo=force: ensure that the system packages I have
 #                              installed are actually used.
 #
-# TODO: --with-system-gengetopt=force
-#       --with-system-lcalc=force
-#
 sage-configure() {
   ./configure \
     --enable-download-from-upstream-url \
@@ -41,6 +38,7 @@ sage-configure() {
     --with-system-fplll=force \
     --with-system-gc=force \
     --with-system-gcc=force \
+    --with-system-gengetopt=force \
     --with-system-gf2x=force \
     --with-system-gfan=force \
     --with-system-gfortran=force \
@@ -51,6 +49,7 @@ sage-configure() {
     --with-system-iconv=force \
     --with-system-iml=force \
     --with-system-isl=force \
+    --with-system-lcalc=force \
     --with-system-libatomic_ops=force \
     --with-system-libbraiding=force \
     --with-system-libffi=force \
@@ -76,13 +75,13 @@ sage-configure() {
     --with-system-qhull=force \
     --with-system-readline=force \
     --with-system-rw=force \
+    --with-system-singular=force \
     --with-system-sqlite=force \
     --with-system-suitesparse=force \
     --with-system-symmetrica=force \
     --with-system-sympow=force \
     --with-system-tachyon=force \
     --with-system-tox=force \
-    --with-system-yasm=force \
     --with-system-xz=force \
     --with-system-zeromq=force \
     --with-system-zlib=force \