Mercurial > octave
changeset 27427:cc7ab4ce0194
Use previously detected CPPFLAGS, LDFLAGS when testing SUNDIALS API (bug #56913).
* configure.ac: Save and restore CPPFLAGS, LDFLAGS when testing for
SUNDIALS API.
| author | Carlo de Falco <carlo.defalco@polimi.it> |
|---|---|
| date | Tue, 17 Sep 2019 16:12:57 +0200 |
| parents | 3ec072ab1bda |
| children | e94868c1369f |
| files | configure.ac |
| diffstat | 1 files changed, 10 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Sep 17 21:40:17 2019 -0700 +++ b/configure.ac Tue Sep 17 16:12:57 2019 +0200 @@ -2184,16 +2184,24 @@ ### Check for SUNDIALS IDA library and header. +save_CPPFLAGS="$CPPFLAGS" +save_LDFLAGS="$LDFLAGS" save_LIBS="$LIBS" LIBS="$SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" +LDFLAGS="$SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS $BLAS_LDFLAGS $LDFLAGS" +CPPFLAGS="$SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS $BLAS_CPPFLAGS $CPPFLAGS" OCTAVE_CHECK_LIB(sundials_ida, [SUNDIALS IDA], [SUNDIALS IDA library not found. The solvers ode15i and ode15s will be disabled.], [ida/ida.h ida.h], [IDAInit], [], [don't use SUNDIALS IDA library, disable solvers ode15i and ode15s]) +CPPFLAGS="$save_CPPFLAGS" +LDFLAGS="$save_LDFLAGS" LIBS="$save_LIBS" ### Check for SUNDIALS library features, some required, some optional. +CPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS $BLAS_CPPFLAGS $CPPFLAGS" +LDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS $BLAS_LDFLAGS $LDFLAGS" LIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" if test -z "$warn_sundials_nvecserial" && test -z "$warn_sundials_ida"; then dnl Any of the following tests could determine that SUNDIALS is incompatible @@ -2217,6 +2225,8 @@ OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU fi fi +CPPFLAGS="$save_CPPFLAGS" +LDFLAGS="$save_LDFLAGS" LIBS="$save_LIBS" dnl Define this way instead of with an #if in oct-conf-post.h so that