Mercurial > octave
diff build-aux/subst-cross-config-vals.in.sh @ 22899:31bd8a50d44c
Add Sundials library support
* build-aux/subst-config-vals.in.sh: Add configuration
variables for sundials_ida, sundials_nvecserial and klu libraries.
* build-aux/subst-cross-config-vals.in.sh: Add configuration variables
for sundials_ida, sundials_nvecserial and klu libraries.
* configure.ac: Check for sundials_ida, sundials_nvecserial and klu
headers and functions. Check whether sundials_ida has been configured
with double precision. Set configuration variables and flags.
* libinterp/build-env.h: Add variables to build_env namespace.
* libinterp/build-env.in.cc: Add variables to build_env namespace.
* m4/acinclude.m4: Add macro to test whether sundials_ida has been
configured with double precision.
* src/mkoctfile.in.cc: Get variables in order to generate oct-file.
| author | Francesco Faccio <francesco.faccio@mail.polimi.it> |
|---|---|
| date | Tue, 23 Aug 2016 02:13:28 +0200 |
| parents | 3a2b891d0b33 |
| children | 8e9dd0d6e337 |
line wrap: on
line diff
--- a/build-aux/subst-cross-config-vals.in.sh Fri Dec 16 00:10:27 2016 -0500 +++ b/build-aux/subst-cross-config-vals.in.sh Tue Aug 23 02:13:28 2016 +0200 @@ -107,6 +107,9 @@ HDF5_LDFLAGS="@HDF5_LDFLAGS@" HDF5_LIBS="@HDF5_LIBS@" includedir="@includedir@" +KLU_CPPFLAGS="@KLU_CPPFLAGS@" +KLU_LDFLAGS="@KLU_LDFLAGS@" +KLU_LIBS="@KLU_LIBS@" LAPACK_LIBS="@LAPACK_LIBS@" LD_CXX="@LD_CXX@" LDFLAGS="@LDFLAGS@" @@ -158,6 +161,12 @@ SH_LDFLAGS="@SH_LDFLAGS@" STATIC_LIBS="@STATIC_LIBS@" SUITESPARSE_CONFIG_LIBS="@SUITESPARSE_CONFIG_LIBS@" +SUNDIALS_IDA_CPPFLAGS="@SUNDIALS_IDA_CPPFLAGS@" +SUNDIALS_IDA_LDFLAGS="@SUNDIALS_IDA_LDFLAGS@" +SUNDIALS_IDA_LIBS="@SUNDIALS_IDA_LIBS@" +SUNDIALS_NVECSERIAL_CPPFLAGS="@SUNDIALS_NVECSERIAL_CPPFLAGS@" +SUNDIALS_NVECSERIAL_LDFLAGS="@SUNDIALS_NVECSERIAL_LDFLAGS@" +SUNDIALS_NVECSERIAL_LIBS="@SUNDIALS_NVECSERIAL_LIBS@" TERM_LIBS="@TERM_LIBS@" UMFPACK_CPPFLAGS="@UMFPACK_CPPFLAGS@" UMFPACK_LDFLAGS="@UMFPACK_LDFLAGS@" @@ -253,6 +262,9 @@ $SED -e "s|%OCTAVE_CONF_HDF5_LDFLAGS%|\"${HDF5_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_HDF5_LIBS%|\"${HDF5_LIBS}\"|" \ -e "s|%OCTAVE_CONF_INCLUDEDIR%|\"${includedir}\"|" \ + -e "s|%OCTAVE_CONF_KLU_CPPFLAGS%|\"${KLU_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_KLU_LDFLAGS%|\"${KLU_LDFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_KLU_LIBS%|\"${KLU_LIBS}\"|" \ -e "s|%OCTAVE_CONF_LAPACK_LIBS%|\"${LAPACK_LIBS}\"|" \ -e "s|%OCTAVE_CONF_LD_CXX%|\"${LD_CXX}\"|" \ -e "s|%OCTAVE_CONF_LDFLAGS%|\"${LDFLAGS}\"|" \ @@ -312,6 +324,12 @@ -e "s|%OCTAVE_CONF_SH_LDFLAGS%|\"${SH_LDFLAGS}\"|" \ -e "s|%OCTAVE_CONF_STATIC_LIBS%|\"${STATIC_LIBS}\"|" \ -e "s|%OCTAVE_CONF_SUITESPARSE_CONFIG_LIBS%|\"${SUITESPARSE_CONFIG_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_SUNDIALS_IDA_CPPFLAGS%|\"${SUNDIALS_IDA_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_SUNDIALS_IDA_LDFLAGS%|\"${SUNDIALS_IDA_LDFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_SUNDIALS_IDA_LIBS%|\"${SUNDIALS_IDA_LIBS}\"|" \ + -e "s|%OCTAVE_CONF_SUNDIALS_NVECSERIAL_CPPFLAGS%|\"${SUNDIALS_NVECSERIAL_CPPFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_SUNDIALS_NVECSERIAL_LDFLAGS%|\"${SUNDIALS_NVECSERIAL_LDFLAGS}\"|" \ + -e "s|%OCTAVE_CONF_SUNDIALS_NVECSERIAL_LIBS%|\"${SUNDIALS_NVECSERIAL_LIBS}\"|" \ -e "s|%OCTAVE_CONF_TERM_LIBS%|\"${TERM_LIBS}\"|" \ -e "s|%OCTAVE_CONF_UMFPACK_CPPFLAGS%|\"${UMFPACK_CPPFLAGS}\"|" \ -e "s|%OCTAVE_CONF_UMFPACK_LDFLAGS%|\"${UMFPACK_LDFLAGS}\"|" \