Skip to content

Commit 6a14506

Browse files
committed
build: Include ida.h from the locations at which it is looked for.
* m4/acinclude.m4 (OCTAVE_CHECK_SUNDIALS_SUNREALTYPE, OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE, OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU): The configure script checks for the SUNDIALS IDA header at "ida.h" and "ida/ida.h". Include that header at the found location in other configure tests. * etc/NEWS.10.md: Add note about change. See also: https://octave.discourse.group/t/6971
1 parent 5b49076 commit 6a14506

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

etc/NEWS.10.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@ Summary of bugs fixed for version 10.3.0 (tbd):
4141

4242
- Add tests for shadowed functions in core Octave (bug #46849).
4343
- Fix building Java on solaris2 platforms (bug #67442).
44+
- Include `ida.h` in configure tests from the locations at which it is looked
45+
for.
4446

4547
### Documentation
4648

m4/acinclude.m4

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2496,6 +2496,8 @@ AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNREALTYPE], [
24962496
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
24972497
#if defined (HAVE_IDA_IDA_H)
24982498
# include <ida/ida.h>
2499+
#elif defined (HAVE_IDA_H)
2500+
# include <ida.h>
24992501
#endif
25002502
]], [[
25012503
sunrealtype test;
@@ -2522,6 +2524,8 @@ AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SIZEOF_REALTYPE], [
25222524
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
25232525
#if defined (HAVE_IDA_IDA_H)
25242526
# include <ida/ida.h>
2527+
#elif defined (HAVE_IDA_H)
2528+
# include <ida.h>
25252529
#endif
25262530
#include <assert.h>
25272531
]], [[
@@ -2590,7 +2594,9 @@ AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU], [
25902594
[octave_cv_sundials_sunlinsol_klu],
25912595
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
25922596
#if defined (HAVE_IDA_IDA_H)
2593-
#include <ida/ida.h>
2597+
# include <ida/ida.h>
2598+
#elif defined (HAVE_IDA_H)
2599+
# include <ida.h>
25942600
#endif
25952601
#if defined (HAVE_KLU_H)
25962602
#include <klu.h>
@@ -2634,7 +2640,9 @@ AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU], [
26342640
[octave_cv_sundials_sunlinsol_klu],
26352641
[AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[
26362642
#if defined (HAVE_IDA_IDA_H)
2637-
#include <ida/ida.h>
2643+
# include <ida/ida.h>
2644+
#elif defined (HAVE_IDA_H)
2645+
# include <ida.h>
26382646
#endif
26392647
#if defined (HAVE_KLU_H)
26402648
#include <klu.h>

0 commit comments

Comments
 (0)