Mercurial > octave

changeset 26938:58e300954518

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
search for klu.h in more places (bug #55950) * acinclude.m4 (OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU): Also check for klu.h, klu/klu.h, and ufsparse/klu.h.
author John W. Eaton <jwe@octave.org>
date Mon, 18 Mar 2019 21:05:20 +0000
parents cfa2a65c9fdc
children 6acb713f8231
files m4/acinclude.m4
diffstat 1 files changed, 13 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/m4/acinclude.m4	Mon Mar 18 19:48:13 2019 +0000
+++ b/m4/acinclude.m4	Mon Mar 18 21:05:20 2019 +0000
@@ -2239,13 +2239,20 @@
 dnl enabled.
 dnl
 AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU], [
-  ## Including <sunlinsol/sunlinsol_klu.h> may depend on including
-  ## <suitesparse/klu.h> first.  So perform the check as follows instead
-  ## of using OCTAVE_CHECK_LIB to check for sunlinsol_klu.h.
-  AC_CHECK_HEADERS([suitesparse/klu.h])
+  ## Including <sunlinsol/sunlinsol_klu.h> may depend on including klu.h
+  ## first.  So perform the check as follows using several different
+  ## possible locations for klu.h instead of using OCTAVE_CHECK_LIB to
+  ## check for sunlinsol_klu.h.
+  AC_CHECK_HEADERS([klu.h klu/klu.h suitesparse/klu.h ufsparse/klu.h])
   AC_CHECK_HEADERS([sunlinsol/sunlinsol_klu.h], [], [],
-    [#ifdef HAVE_SUITESPARSE_KLU_H
-     # include <suitesparse/klu.h>
+    [#if defined (HAVE_KLU_H)
+     #  include <klu.h>
+     #elif  defined (HAVE_KLU_KLU_H)
+     #  include <klu/klu.h>
+     #elif  defined (HAVE_SUITESPARSE_KLU_H)
+     #  include <suitesparse/klu.h>
+     #elif  defined (HAVE_UFSPARSE_KLU_H)
+     #  include <ufsparse/klu.h>
      #endif
     ])
   OCTAVE_CHECK_LIB(sundials_sunlinsolklu, SUNLINSOL_KLU, [],