Mercurial > octave

changeset 26900:ebe7e12765ba

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix sundials configure warnings (bug #55911) * acinclude.m4 (OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU, OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE): Define variable for warning string with the same name as is used in the call to OCTAVE_CONFIGURE_WARNING. (OCTAVE_CHECK_SUNDIALS_SUNLINSOL_DENSE): Remove stray #endif in test program.
author John W. Eaton <jwe@octave.org>
date Wed, 13 Mar 2019 19:14:22 +0000
parents 236d8f52cbb3
children f422fc45b52f
files m4/acinclude.m4
diffstat 1 files changed, 5 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/m4/acinclude.m4	Wed Mar 13 18:54:11 2019 +0000
+++ b/m4/acinclude.m4	Wed Mar 13 19:14:22 2019 +0000
@@ -2219,7 +2219,7 @@
     [octave_cv_sundials_realtype_is_double],
     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
         #if defined (HAVE_IDA_IDA_H)
-        #include <ida/ida.h>
+        #  include <ida/ida.h>
         #endif
         #include <assert.h>
         ]], [[
@@ -2271,7 +2271,7 @@
     AC_DEFINE(HAVE_SUNDIALS_SUNLINSOL_KLU, 1,
       [Define to 1 if SUNDIALS IDA is configured with SUNLINSOL_KLU enabled.])
   else
-    warn_sundials_idaklu="SUNDIALS IDA library not configured with SUNLINSOL_KLU, ode15i and ode15s will not support the sparse Jacobian feature"
+    warn_sundials_sunlinsol_klu="SUNDIALS IDA library not configured with SUNLINSOL_KLU, ode15i and ode15s will not support the sparse Jacobian feature"
     OCTAVE_CONFIGURE_WARNING([warn_sundials_sunlinsol_klu])
   fi
 ])
@@ -2285,12 +2285,11 @@
     [octave_cv_sundials_sunlinsol_dense],
     [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
          #if defined (HAVE_IDA_IDA_H)
-         #include <ida/ida.h>
+         #  include <ida/ida.h>
          #endif
          #if defined (HAVE_SUNLINSOL_SUNLINSOL_DENSE_H)
-         #include <sunlinsol/sunlinsol_dense.h>
+         #  include <sunlinsol/sunlinsol_dense.h>
          #endif
-         #endif         
          ]], [[
          void *mem = 0;
          long int num = 0;
@@ -2303,7 +2302,7 @@
     AC_DEFINE(HAVE_SUNDIALS_SUNLINSOL_DENSE, 1,
       [Define to 1 if SUNDIALS IDA includes the SUNLINSOL_DENSE linear solver.])
   else
-    warn_sundials_ida_dense="SUNDIALS IDA library does not include the SUNLINSOL_DENSE linear solver, ode15i and ode15s will be disabled"
+    warn_sundials_sunlinsol_dense="SUNDIALS IDA library does not include the SUNLINSOL_DENSE linear solver, ode15i and ode15s will be disabled"
     OCTAVE_CONFIGURE_WARNING([warn_sundials_sunlinsol_dense])
   fi
 ])