Mercurial > octave

diff liboctave/util/oct-sparse.h @ 21160:b5b531ba93ce

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: Use configure-time test to check CXSparse version. * configure.ac: Call OCTAVE_CHECK_CXSPARSE_VERSION_OK macro and error out of configure if version is < 2.2. * acinclude.m4 (OCTAVE_CHECK_CXSPARSE_VERSION_OK) : New macro. * oct-sparse.h: Remove compie-time test for CXSparse version.
author Rik <rik@octave.org>
date Sat, 30 Jan 2016 20:48:21 -0800
parents 8ad3907b8fad
children 791dcb32b657
line wrap: on
line diff
--- a/liboctave/util/oct-sparse.h	Tue Jan 19 12:31:06 2016 +1100
+++ b/liboctave/util/oct-sparse.h	Sat Jan 30 20:48:21 2016 -0800
@@ -83,18 +83,6 @@
 #include <cs.h>
 #endif
 
-// Yes, it would be better to use a configure script check for
-// required CXSparse features, but that seems more trouble than it is
-// worth in this case.
-
-#if (defined (HAVE_CXSPARSE)                    \
-     && (! defined (CS_VER) \
-         || CS_VER < 2 \
-         || (CS_VER == 2 && CS_SUBVER < 2)))
-#error "Octave requires CXSparse version 2.2 or later"
-#error "Upgrade CXSparse (SuiteSparse) or configure Octave with --disable-cxsparse"
-#endif
-
 #if (defined (HAVE_SUITESPARSE_CHOLMOD_H) \
      || defined (HAVE_UFSPARSE_CHOLMOD_H) \
      || defined (HAVE_CHOLMOD_CHOLMOD_H) \
@@ -106,8 +94,8 @@
 #endif
 #endif
 
-// Cope with new suitesparse versions
-//
+// Cope with new SuiteSparse versions
+
 #if defined (SUITESPARSE_VERSION)
 # if SUITESPARSE_VERSION >= SUITESPARSE_VER_CODE (4, 3)
 #  define SUITESPARSE_NAME(name) SuiteSparse_ ## name