Mercurial > octave-nkf

changeset 6236:1bed9b2c26e0

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2007-01-10 18:20:18 by jwe]
author jwe
date Wed, 10 Jan 2007 18:20:18 +0000
parents 9ff5a6936031
children 4a8c7f586ec4
files liboctave/ChangeLog liboctave/oct-sparse.h
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/liboctave/ChangeLog	Wed Jan 10 06:35:47 2007 +0000
+++ b/liboctave/ChangeLog	Wed Jan 10 18:20:18 2007 +0000
@@ -1,3 +1,8 @@
+2007-01-10  John W. Eaton  <jwe@octave.org>
+
+	* oct-sparse.h: Use HAVE_CHOLMOD_CHOLMOD_H, not
+	HAVE_UMFPACK_CHOLMOD_H for case of "cholmod/cholmod.h".
+
 2007-01-08  David Bateman  <dbateman@free.fr>
 
 	* oct-sparse.h: Replace sparsesuite with suitesparse and
--- a/liboctave/oct-sparse.h	Wed Jan 10 06:35:47 2007 +0000
+++ b/liboctave/oct-sparse.h	Wed Jan 10 18:20:18 2007 +0000
@@ -76,7 +76,7 @@
 #include <suitesparse/cholmod.h>
 #elif defined (HAVE_UFSPARSE_CHOLMOD_H)
 #include <ufsparse/cholmod.h>
-#elif defined (HAVE_UMFPACK_CHOLMOD_H)
+#elif defined (HAVE_CHOLMOD_CHOLMOD_H)
 #include <cholmod/cholmod.h>
 #elif defined (HAVE_CHOLMOD_H)
 #include <cholmod.h>
@@ -94,7 +94,7 @@
 
 #if (defined (HAVE_SUITESPARSE_CHOLMOD_H) \
      || defined (HAVE_UFSPARSE_CHOLMOD_H) \
-     || defined (HAVE_UMFPACK_CHOLMOD_H) \
+     || defined (HAVE_CHOLMOD_CHOLMOD_H) \
      || defined (HAVE_CHOLMOD_H))
 #ifdef IDX_TYPE_LONG
 #define CHOLMOD_NAME(name) cholmod_l_ ## name