Mercurial > octave
changeset 22904:a1f1ab76aa64
Fix changes lost when closing ode15i branch.
* build-aux/subst-config-vals.in.sh : restore substitution of
sundials related flags.
| author | Carlo de Falco <carlo.defalco@polimi.it> |
|---|---|
| date | Thu, 15 Dec 2016 15:10:28 +0100 |
| parents | 51c9eded34ee |
| children | 9b2e62bf7906 |
| files | build-aux/subst-config-vals.in.sh |
| diffstat | 1 files changed, 12 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/build-aux/subst-config-vals.in.sh Wed Nov 02 06:28:24 2016 +0100 +++ b/build-aux/subst-config-vals.in.sh Thu Dec 15 15:10:28 2016 +0100 @@ -157,6 +157,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@" @@ -314,6 +320,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}\"|" \