Mercurial > octave
changeset 25309:7d32780f4dea stable
avoid syntax error in configure if cxsparse is missing
* configure.in: If cxsparse is missing, skip additional check.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Wed, 25 Apr 2018 08:55:48 -0400 |
| parents | f2eb8bfcccb6 |
| children | 0b253ba6eb91 |
| files | configure.ac |
| diffstat | 1 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/configure.ac Tue Apr 24 14:08:30 2018 -0500 +++ b/configure.ac Wed Apr 25 08:55:48 2018 -0400 @@ -2480,11 +2480,13 @@ [cs${CXSPARSE_TAG}sqr], [C++], [don't use CXSparse library, disable some sparse matrix functionality]) -## Additional check for CXSparse version >= 2.2 -if test $octave_cv_lib_cxsparse = yes; then - OCTAVE_CHECK_CXSPARSE_VERSION_OK - if test $octave_cv_cxsparse_version_ok = no; then - AC_MSG_ERROR([CXSparse library is too old (< version 2.2). Upgrade CXSparse (SuiteSparse) or configure Octave with --disable-cxsparse"]) +if test -z "$warn_cxsparse"; then + ## Additional check for CXSparse version >= 2.2 + if test $octave_cv_lib_cxsparse = yes; then + OCTAVE_CHECK_CXSPARSE_VERSION_OK + if test $octave_cv_cxsparse_version_ok = no; then + AC_MSG_ERROR([CXSparse library is too old (< version 2.2). Upgrade CXSparse (SuiteSparse) or configure Octave with --disable-cxsparse"]) + fi fi fi