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

Commit

Permalink
configure.ac, sage_spkg_configure.m4: Set default --with-system-gcc=f…
Browse files Browse the repository at this point in the history
…orce, --with-system-python3=force
  • Loading branch information
Matthias Koeppe committed Sep 15, 2021
1 parent b566863 commit 48cdeb4
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 2 deletions.
5 changes: 5 additions & 0 deletions configure.ac
Original file line number Diff line number Diff line change
Expand Up @@ -452,6 +452,11 @@ AC_ARG_ENABLE([r],
done
])

dnl Packages that require a special override to use the SPKG
dnl when the system package is not usable.
AS_VAR_SET([sage_use_system_gcc], [force])
AS_VAR_SET([sage_use_system_python3], [force])

SAGE_SPKG_COLLECT()

dnl AC_CONFIG_HEADERS([config.h])
Expand Down
6 changes: 4 additions & 2 deletions m4/sage_spkg_configure.m4
Original file line number Diff line number Diff line change
Expand Up @@ -65,12 +65,14 @@ AS_BOX([Checking whether SageMath should install SPKG $1...]) >& AS_MESSAGE_LOG_
AC_ARG_WITH([system-]SPKG_NAME,
AS_HELP_STRING(--with-system-SPKG_NAME={no|yes (default)|force (exit with an error if no usable version is found)},
[detect and use an existing system SPKG_NAME]),
[AS_VAR_SET(SPKG_USE_SYSTEM, [$withval])],
[AS_VAR_SET(SPKG_USE_SYSTEM, [yes])]
[AS_VAR_SET(SPKG_USE_SYSTEM, [$withval])]
)
AS_VAR_SET([sage_spkg_name], SPKG_NAME)
dnl Default value for most packages
AS_VAR_SET_IF([SPKG_USE_SYSTEM], [], [AS_VAR_SET([SPKG_USE_SYSTEM], [yes])])
dnl The default is not to install a package, unless a check below finds that we should.
AS_VAR_SET(SPKG_INSTALL, [no])
Expand Down

0 comments on commit 48cdeb4

Please sign in to comment.