Mercurial > octave
changeset 28934:cca6a3b60294
maint: merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Thu, 15 Oct 2020 12:49:28 +0200 |
parents | ec6fbdc9b6a9 (current diff) 34a83d34038e (diff) |
children | 9accea638b5c |
files | configure.ac m4/acinclude.m4 |
diffstat | 2 files changed, 0 insertions(+), 34 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Wed Oct 14 21:32:03 2020 -0700 +++ b/configure.ac Thu Oct 15 12:49:28 2020 +0200 @@ -2279,9 +2279,6 @@ if test -z "$warn_sundials_disabled"; then OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE fi - if test -z "$warn_sundials_disabled"; then - OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE - fi dnl The following tests determine whether certain optional features are dnl present in the SUNDIALS libraries, but will not disable using SUNDIALS. if test -z "$warn_sundials_disabled"; then
--- a/m4/acinclude.m4 Wed Oct 14 21:32:03 2020 -0700 +++ b/m4/acinclude.m4 Thu Oct 15 12:49:28 2020 +0200 @@ -2049,37 +2049,6 @@ fi ]) dnl -dnl Check whether SUNDIALS IDA library has the SUNLINSOL_DENSE linear solver. -dnl The IDADENSE API was removed in SUNDIALS version 3.0.0. -dnl -AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE], [ - AC_CHECK_HEADERS([sunlinsol/sunlinsol_dense.h]) - AC_CACHE_CHECK([whether SUNDIALS IDA includes the SUNLINSOL_DENSE linear solver], - [octave_cv_sundials_sunlinsol_dense], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ - #if defined (HAVE_IDA_IDA_H) - # include <ida/ida.h> - #endif - #if defined (HAVE_SUNLINSOL_SUNLINSOL_DENSE_H) - # include <sunlinsol/sunlinsol_dense.h> - #endif - ]], [[ - void *mem = 0; - long int num = 0; - IDADense (mem, num); - ]])], - octave_cv_sundials_sunlinsol_dense=yes, - octave_cv_sundials_sunlinsol_dense=no) - ]) - if test $octave_cv_sundials_sunlinsol_dense = yes; then - AC_DEFINE(HAVE_SUNDIALS_SUNLINSOL_DENSE, 1, - [Define to 1 if SUNDIALS IDA includes the SUNLINSOL_DENSE linear solver.]) - else - warn_sundials_disabled="SUNDIALS IDA library does not include the SUNLINSOL_DENSE linear solver. The solvers ode15i and ode15s will be disabled." - OCTAVE_CONFIGURE_WARNING([warn_sundials_disabled]) - fi -]) -dnl dnl Add warning to final summary. dnl AC_DEFUN([OCTAVE_CONFIGURE_WARNING], [