Mercurial > hg > octave-lyh
diff liboctave/oct-sparse.h @ 5610:9761b7d24e9e
[project @ 2006-02-09 09:12:02 by dbateman]
| author | dbateman |
|---|---|
| date | Thu, 09 Feb 2006 09:12:03 +0000 |
| parents | a9bd6c31751f |
| children | 69a4f320d95a |
line wrap: on
line diff
--- a/liboctave/oct-sparse.h +++ b/liboctave/oct-sparse.h @@ -42,26 +42,24 @@ #if defined (HAVE_UFSPARSE_COLAMD_H) #include <ufsparse/colamd.h> -#elif defined (HAVE_UMFPACK_COLAMD_H) -#include <umfpack/colamd.h> +#elif defined (HAVE_COLAMD_COLAMD_H) +#include <colamd/colamd.h> #elif defined (HAVE_COLAMD_H) #include <colamd.h> #endif #if defined (HAVE_UFSPARSE_CCOLAMD_H) #include <ufsparse/ccolamd.h> -#elif defined (HAVE_UMFPACK_CCOLAMD_H) -#include <umfpack/ccolamd.h> +#elif defined (HAVE_CCOLAMD_CCOLAMD_H) +#include <ccolamd/ccolamd.h> #elif defined (HAVE_CCOLAMD_H) #include <ccolamd.h> #endif -#if defined (HAVE_METIS_METIS_H) +#if defined (HAVE_UFSPARSE_METIS_H) +#include <ufsparse/metis.h> +#elif defined (HAVE_METIS_METIS_H) #include <metis/metis.h> -#elif defined (HAVE_UFSPARSE_METIS_H) -#include <ufsparse/metis.h> -#elif defined (HAVE_UMFPACK_METIS_H) -#include <umfpack/metis.h> #elif defined (HAVE_METIS_H) #include <metis.h> #endif @@ -69,11 +67,19 @@ #if defined (HAVE_UFSPARSE_CHOLMOD_H) #include <ufsparse/cholmod.h> #elif defined (HAVE_UMFPACK_CHOLMOD_H) -#include <umfpack/cholmod.h> +#include <cholmod/cholmod.h> #elif defined (HAVE_CHOLMOD_H) #include <cholmod.h> #endif +#if defined (HAVE_UFSPARSE_CXS_H) +#include <ufsparse/cxs.h> +#elif defined (HAVE_CXSPARSE_CXS_H) +#include <cxsparse/cxs.h> +#elif defined (HAVE_CXS_H) +#include <cxs.h> +#endif + #if (defined (HAVE_UFSPARSE_CHOLMOD_H) \ || defined (HAVE_UMFPACK_CHOLMOD_H) \ || defined (HAVE_CHOLMOD_H))