# HG changeset patch # User Carlo de Falco # Date 1568729577 -7200 # Tue Sep 17 16:12:57 2019 +0200 # Node ID 6a9299996609a85f0a406cffeeb78803cef9c247 # Parent f844b1f03dcc1191768698d25fbca8e0488ba8ad Fix LDFLAGS and CPPFLAGS when testing SUNDIALS API (bug #56913) * configure.ac : Use previously detected LDFLAGS and CPPFLAGS when testing SUNDIALS API diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -2195,16 +2195,24 @@ ### Check for SUNDIALS IDA library and header. save_LIBS="$LIBS" +save_LDFLAGS="$LDFLAGS" +save_CPPFLAGS="$CPPFLAGS" 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]) LIBS="$save_LIBS" +LDFLAGS="$save_LDFLAGS" +CPPFLAGS="$save_CPPFLAGS" ### Check for SUNDIALS library features, some required, some optional. LIBS="$SUNDIALS_IDA_LIBS $SUNDIALS_NVECSERIAL_LIBS $KLU_LIBS $BLAS_LIBS $FLIBS $LIBS" +LDFLAGS="$SUNDIALS_IDA_LDFLAGS $SUNDIALS_NVECSERIAL_LDFLAGS $KLU_LDFLAGS $BLAS_LDFLAGS $LDFLAGS" +CPPFLAGS="$SUNDIALS_IDA_CPPFLAGS $SUNDIALS_NVECSERIAL_CPPFLAGS $KLU_CPPFLAGS $BLAS_CPPFLAGS $CPPFLAGS" if test -z "$warn_sundials_nvecserial" && test -z "$warn_sundials_ida"; then dnl Any of the following tests could determine that SUNDIALS is incompatible dnl and should be disabled. In that event, they all populate the same @@ -2228,6 +2236,8 @@ fi fi LIBS="$save_LIBS" +LDFLAGS="$save_LDFLAGS" +CPPFLAGS="$save_CPPFLAGS" dnl Define this way instead of with an #if in oct-conf-post.h so that dnl the build features script will get the correct value.