Mercurial > octave
diff m4/acinclude.m4 @ 26910:075c4d3bf1de
use OCTAVE_CHECK_LIB to check for sundials_sunlinsolklu library
*
* subst-config-vals.in.sh, subst-cross-config-vals.in.sh, build-env.h,
build-env.in.cc: Substitute new variables.
* changed configure.ac: Report info about sundials_sunlinsolklu
LIBS, CPPFLAGS, and LDFLAGS.
* acinclude.m4 (OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU): Use
OCTAVE_CHECK_LIB.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 14 Mar 2019 08:00:59 +0000 |
| parents | 5042a568771a |
| children | c81b471cdb28 |
line wrap: on
line diff
--- a/m4/acinclude.m4 Thu Mar 14 07:05:22 2019 +0000 +++ b/m4/acinclude.m4 Thu Mar 14 08:00:59 2019 +0000 @@ -2239,12 +2239,12 @@ dnl enabled. dnl AC_DEFUN([OCTAVE_CHECK_SUNDIALS_SUNLINSOL_KLU], [ - AC_CHECK_HEADERS([sunlinsol/sunlinsol_klu.h]) - AC_CHECK_LIB([sundials_sunlinsolklu], [SUNKLU], - [SUNDIALS_SUNLINSOL_KLU_LIBS=-lsundials_sunlinsolklu]) - AC_CACHE_CHECK([whether SUNDIALS IDA is configured with SUNLINSOL_KLU enabled], - [octave_cv_sundials_sunlinsol_klu], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ + OCTAVE_CHECK_LIB(sundials_sunlinsolklu, SUNLINSOL_KLU, [], + [sunlinsol/sunlinsol_klu.h], [SUNKLU], [], + [don't use SUNLINSOL_KLU library], + [AC_CACHE_CHECK([whether compiling a program that calls SUNKLU works], + [octave_cv_sundials_sunlinsol_klu], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #if defined (HAVE_IDA_IDA_H) #include <ida/ida.h> #endif @@ -2268,7 +2268,7 @@ ]])], octave_cv_sundials_sunlinsol_klu=yes, octave_cv_sundials_sunlinsol_klu=no) - ]) + ])]) if test $octave_cv_sundials_sunlinsol_klu = yes \ && test "x$ac_cv_header_sunlinsol_sunlinsol_klu_h" = xyes; then AC_DEFINE(HAVE_SUNDIALS_SUNLINSOL_KLU, 1,