Mercurial > octave
changeset 30797:ff68e658ef8f
maint: Merge stable to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Tue, 01 Mar 2022 20:23:17 +0100 |
parents | 7a0dae91a4fc (current diff) e53ddadaf15e (diff) |
children | df5d3552e67c |
files | |
diffstat | 2 files changed, 0 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/liboctave/util/oct-sparse.h Tue Mar 01 19:49:38 2022 +0100 +++ b/liboctave/util/oct-sparse.h Tue Mar 01 20:23:17 2022 +0100 @@ -37,8 +37,6 @@ #if defined (HAVE_SUITESPARSE_AMD_H) # include <suitesparse/amd.h> -#elif defined (HAVE_UFSPARSE_AMD_H) -# include <ufsparse/amd.h> #elif defined (HAVE_AMD_AMD_H) # include <amd/amd.h> #elif defined (HAVE_AMD_H) @@ -47,8 +45,6 @@ #if defined (HAVE_SUITESPARSE_CCOLAMD_H) # include <suitesparse/ccolamd.h> -#elif defined (HAVE_UFSPARSE_CCOLAMD_H) -# include <ufsparse/ccolamd.h> #elif defined (HAVE_CCOLAMD_CCOLAMD_H) # include <ccolamd/ccolamd.h> #elif defined (HAVE_CCOLAMD_H) @@ -57,8 +53,6 @@ #if defined (HAVE_SUITESPARSE_CHOLMOD_H) # include <suitesparse/cholmod.h> -#elif defined (HAVE_UFSPARSE_CHOLMOD_H) -# include <ufsparse/cholmod.h> #elif defined (HAVE_CHOLMOD_CHOLMOD_H) # include <cholmod/cholmod.h> #elif defined (HAVE_CHOLMOD_H) @@ -67,8 +61,6 @@ #if defined (HAVE_SUITESPARSE_COLAMD_H) # include <suitesparse/colamd.h> -#elif defined (HAVE_UFSPARSE_COLAMD_H) -# include <ufsparse/colamd.h> #elif defined (HAVE_COLAMD_COLAMD_H) # include <colamd/colamd.h> #elif defined (HAVE_COLAMD_H) @@ -77,8 +69,6 @@ #if defined (HAVE_SUITESPARSE_CS_H) # include <suitesparse/cs.h> -#elif defined (HAVE_UFSPARSE_CS_H) -# include <ufsparse/cs.h> #elif defined (HAVE_CXSPARSE_CS_H) # include <cxsparse/cs.h> #elif defined (HAVE_CS_H) @@ -87,8 +77,6 @@ #if defined (HAVE_SUITESPARSE_UMFPACK_H) # include <suitesparse/umfpack.h> -#elif defined (HAVE_UFSPARSE_UMFPACK_H) -# include <ufsparse/umfpack.h> #elif defined (HAVE_UMFPACK_UMFPACK_H) # include <umfpack/umfpack.h> #elif defined (HAVE_UMFPACK_H)
--- a/m4/acinclude.m4 Tue Mar 01 19:49:38 2022 +0100 +++ b/m4/acinclude.m4 Tue Mar 01 20:23:17 2022 +0100 @@ -312,8 +312,6 @@ AC_PREPROC_IFELSE([AC_LANG_PROGRAM([[ #if defined (HAVE_SUITESPARSE_CS_H) #include <suitesparse/cs.h> - #elif defined (HAVE_UFSPARSE_CS_H) - #include <ufsparse/cs.h> #elif defined (HAVE_CXSPARSE_CS_H) #include <cxsparse/cs.h> #elif defined (HAVE_CS_H) @@ -3587,8 +3585,6 @@ #include <math.h> #if defined (HAVE_SUITESPARSE_UMFPACK_H) # include <suitesparse/umfpack.h> - #elif defined (HAVE_UFSPARSE_UMFPACK_H) - # include <ufsparse/umfpack.h> #elif defined (HAVE_UMFPACK_UMFPACK_H) # include <umfpack/umfpack.h> #elif defined (HAVE_UMFPACK_H)