Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
m4/sage_spkg_collect.m4: Replace read from requirements.txt by use of…
Browse files Browse the repository at this point in the history
… macro argument
  • Loading branch information
Matthias Koeppe committed Feb 18, 2022
1 parent 8070dd9 commit be824d6
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions m4/sage_spkg_collect.m4
Original file line number Diff line number Diff line change
Expand Up @@ -251,26 +251,25 @@ AC_DEFUN([SAGE_SPKG_FINALIZE], [dnl
SAGE_NEED_SYSTEM_PACKAGES_VAR=SAGE_NEED_SYSTEM_PACKAGES_OPTIONAL
])
])
m4_case(SPKG_TYPE,
[standard], [], [dnl optional|experimental
m4_define([in_sdist], [no])
uninstall_message=", use \"$srcdir/configure --disable-SPKG_NAME\" to uninstall"
])
dnl Trac #29629: Temporary solution for Sage 9.1: Do not advertise installing pip packages
dnl using ./configure --enable-SPKG
if test -f "$DIR/requirements.txt"; then
m4_case(SPKG_SOURCE,
[pip], [dnl
message="SPKG_TYPE pip package; use \"./sage -i SPKG_NAME\" to install"
uninstall_message="SPKG_TYPE pip package (installed)"
fi
])dnl
dnl
SAGE_PACKAGE_VERSIONS="${SAGE_PACKAGE_VERSIONS}$(printf '\nvers_')SPKG_NAME = ${SPKG_VERSION}"
dnl
AS_VAR_PUSHDEF([sage_spkg_install], [sage_spkg_install_]SPKG_NAME)dnl
AS_VAR_PUSHDEF([sage_require], [sage_require_]SPKG_NAME)dnl
AS_VAR_PUSHDEF([sage_use_system], [sage_use_system_]SPKG_NAME)dnl
dnl
dnl If $sage_spkg_install_{SPKG_NAME} is set to no, then set inst_<pkgname> to
dnl some dummy file to skip the installation. Note that an explicit
dnl "./sage -i SPKG_NAME" will still install the package.
Expand Down

0 comments on commit be824d6

Please sign in to comment.