Mercurial > hg > octave-lyh

diff liboctave/oct-sparse.h @ 6186:237a7f535bbc

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
[project @ 2006-11-28 20:13:39 by dbateman]
author dbateman
date Tue, 28 Nov 2006 20:13:40 +0000
parents 69a4f320d95a
children 82021cf7e53a
line wrap: on
line diff
--- a/liboctave/oct-sparse.h
+++ b/liboctave/oct-sparse.h
@@ -32,7 +32,9 @@
 extern "C" {
 #endif
 
-#if defined (HAVE_UFSPARSE_UMFPACK_H)
+#if defined (HAVE_SPARSESUITE_UMFPACK_H)
+#include <sparsesuite/umfpack.h>
+#elif defined (HAVE_UFSPARSE_UMFPACK_H)
 #include <ufsparse/umfpack.h>
 #elif defined (HAVE_UMFPACK_UMFPACK_H)
 #include <umfpack/umfpack.h>
@@ -40,7 +42,9 @@
 #include <umfpack.h>
 #endif
 
-#if defined (HAVE_UFSPARSE_COLAMD_H)
+#if defined (HAVE_SPARSESUITE_COLAMD_H)
+#include <sparsesuite/colamd.h>
+#elif defined (HAVE_UFSPARSE_COLAMD_H)
 #include <ufsparse/colamd.h>
 #elif defined (HAVE_COLAMD_COLAMD_H)
 #include <colamd/colamd.h>
@@ -48,7 +52,9 @@
 #include <colamd.h>
 #endif
 
-#if defined (HAVE_UFSPARSE_CCOLAMD_H)
+#if defined (HAVE_SPARSESUITE_CCOLAMD_H)
+#include <sparsesuite/ccolamd.h>
+#elif defined (HAVE_UFSPARSE_CCOLAMD_H)
 #include <ufsparse/ccolamd.h>
 #elif defined (HAVE_CCOLAMD_CCOLAMD_H)
 #include <ccolamd/ccolamd.h>
@@ -56,7 +62,9 @@
 #include <ccolamd.h>
 #endif
 
-#if defined (HAVE_UFSPARSE_METIS_H)
+#if defined (HAVE_SPARSESUITE_METIS_H)
+#include <sparsesuite/metis.h>
+#elif defined (HAVE_UFSPARSE_METIS_H)
 #include <ufsparse/metis.h>
 #elif defined (HAVE_METIS_METIS_H)
 #include <metis/metis.h>
@@ -64,7 +72,9 @@
 #include <metis.h>
 #endif
 
-#if defined (HAVE_UFSPARSE_CHOLMOD_H)
+#if defined (HAVE_SPARSESUITE_CHOLMOD_H)
+#include <sparsesuite/cholmod.h>
+#elif defined (HAVE_UFSPARSE_CHOLMOD_H)
 #include <ufsparse/cholmod.h>
 #elif defined (HAVE_UMFPACK_CHOLMOD_H)
 #include <cholmod/cholmod.h>
@@ -72,7 +82,9 @@
 #include <cholmod.h>
 #endif
 
-#if defined (HAVE_UFSPARSE_CS_H)
+#if defined (HAVE_SPARSESUITE_CS_H)
+#include <sparsesuite/cs.h>
+#elif defined (HAVE_UFSPARSE_CS_H)
 #include <ufsparse/cs.h>
 #elif defined (HAVE_CXSPARSE_CS_H)
 #include <cxsparse/cs.h>
@@ -80,7 +92,8 @@
 #include <cs.h>
 #endif
 
-#if (defined (HAVE_UFSPARSE_CHOLMOD_H) \
+#if (defined (HAVE_SPARSESUITE_CHOLMOD_H) \
+     || defined (HAVE_UFSPARSE_CHOLMOD_H) \
      || defined (HAVE_UMFPACK_CHOLMOD_H) \
      || defined (HAVE_CHOLMOD_H))
 #ifdef IDX_TYPE_LONG