Skip to content
This repository was archived by the owner on Feb 1, 2023. It is now read-only.

Commit affcad3

Browse files
author
Matthias Koeppe
committed
bootstrap: Emit initialization of SAGE_ENABLE_... variables for all packages; do not call SAGE_SPKG_ENABLE for standard packages
1 parent 47e83d8 commit affcad3

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

bootstrap

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,13 @@ bootstrap () {
8181
rm -f m4/sage_spkg_configures.m4
8282
spkg_configures=""
8383

84-
# --disable-SPKG options for standard packages, followed by
84+
# initialize SAGE_ENABLE... options for standard packages
85+
for pkgname in $(./sage --package list :standard: | sort); do
86+
spkg_configures="$spkg_configures
87+
AC_SUBST(SAGE_ENABLE_$pkgname, [yes])"
88+
done
8589
# --enable-SPKG options
86-
for pkgname in $(./sage --package list :standard: | sort) \
87-
$(./sage --package list :optional: :experimental: | sort); do
90+
for pkgname in $(./sage --package list :optional: :experimental: | sort); do
8891
# Trac #29629: Temporary solution for Sage 9.1: Do not provide
8992
# --enable-SPKG options for installing pip packages
9093
if [ ! -f build/pkgs/$pkgname/requirements.txt ]; then
@@ -93,6 +96,7 @@ bootstrap () {
9396
case "$pkgname" in
9497
_*) ;;
9598
*) spkg_configures="$spkg_configures
99+
AC_SUBST(SAGE_ENABLE_$pkgname, [if_installed])
96100
SAGE_SPKG_ENABLE([$pkgname], [$pkgtype])" ;;
97101
esac
98102
fi

0 commit comments

Comments
 (0)