UFSparse -> SparseSuite

[David Bateman]

As UFSparse has changed it name to SparseSuite. It seems to me a change
like that in the attached patch will be necessary in the near future..

D.

-- 
David Bateman                                address@hidden
Motorola Labs - Paris                        +33 1 69 35 48 04 (Ph) 
Parc Les Algorithmes, Commune de St Aubin    +33 6 72 01 06 33 (Mob) 
91193 Gif-Sur-Yvette FRANCE                  +33 1 69 35 77 01 (Fax) 

The information contained in this communication has been classified as: 

[x] General Business Information 
[ ] Motorola Internal Use Only 
[ ] Motorola Confidential Proprietary

*** ./liboctave/oct-sparse.h.orig2      2006-11-23 11:51:43.023333054 +0100
--- ./liboctave/oct-sparse.h    2006-11-23 11:54:20.416384296 +0100
***************
*** 32,38 ****
  extern "C" {
  #endif
  
! #if defined (HAVE_UFSPARSE_UMFPACK_H)
  #include <ufsparse/umfpack.h>
  #elif defined (HAVE_UMFPACK_UMFPACK_H)
  #include <umfpack/umfpack.h>
--- 32,40 ----
  extern "C" {
  #endif
  
! #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,46 ****
  #include <umfpack.h>
  #endif
  
! #if defined (HAVE_UFSPARSE_COLAMD_H)
  #include <ufsparse/colamd.h>
  #elif defined (HAVE_COLAMD_COLAMD_H)
  #include <colamd/colamd.h>
--- 42,50 ----
  #include <umfpack.h>
  #endif
  
! #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,54 ****
  #include <colamd.h>
  #endif
  
! #if defined (HAVE_UFSPARSE_CCOLAMD_H)
  #include <ufsparse/ccolamd.h>
  #elif defined (HAVE_CCOLAMD_CCOLAMD_H)
  #include <ccolamd/ccolamd.h>
--- 52,60 ----
  #include <colamd.h>
  #endif
  
! #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,62 ****
  #include <ccolamd.h>
  #endif
  
! #if defined (HAVE_UFSPARSE_METIS_H)
  #include <ufsparse/metis.h>
  #elif defined (HAVE_METIS_METIS_H)
  #include <metis/metis.h>
--- 62,70 ----
  #include <ccolamd.h>
  #endif
  
! #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,70 ****
  #include <metis.h>
  #endif
  
! #if defined (HAVE_UFSPARSE_CHOLMOD_H)
  #include <ufsparse/cholmod.h>
  #elif defined (HAVE_UMFPACK_CHOLMOD_H)
  #include <cholmod/cholmod.h>
--- 72,80 ----
  #include <metis.h>
  #endif
  
! #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,78 ****
  #include <cholmod.h>
  #endif
  
! #if defined (HAVE_UFSPARSE_CS_H)
  #include <ufsparse/cs.h>
  #elif defined (HAVE_CXSPARSE_CS_H)
  #include <cxsparse/cs.h>
--- 82,90 ----
  #include <cholmod.h>
  #endif
  
! #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,86 ****
  #include <cs.h>
  #endif
  
! #if (defined (HAVE_UFSPARSE_CHOLMOD_H) \
       || defined (HAVE_UMFPACK_CHOLMOD_H) \
       || defined (HAVE_CHOLMOD_H))
  #ifdef IDX_TYPE_LONG
--- 92,99 ----
  #include <cs.h>
  #endif
  
! #if (defined (HAVE_SPARSESUITE_CHOLMOD_H) \
!      || defined (HAVE_UFSPARSE_CHOLMOD_H) \
       || defined (HAVE_UMFPACK_CHOLMOD_H) \
       || defined (HAVE_CHOLMOD_H))
  #ifdef IDX_TYPE_LONG
*** ./configure.in.orig2        2006-11-23 11:52:03.728290701 +0100
--- ./configure.in      2006-11-23 11:52:09.946977429 +0100
***************
*** 842,848 ****
  warn_umfpack="UMFPACK not found.  This will result in some lack of 
functionality for sparse matrices."
  if test "$with_umfpack" = yes && test "$with_amd" = yes; then
    with_umfpack=no
!   AC_CHECK_HEADERS([ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], [
      AC_CHECK_LIB(umfpack, umfpack_zi_get_determinant, [
        UMFPACK_LIBS="-lumfpack"; with_umfpack=yes], [
          ## Invalidate the cache.
--- 842,848 ----
  warn_umfpack="UMFPACK not found.  This will result in some lack of 
functionality for sparse matrices."
  if test "$with_umfpack" = yes && test "$with_amd" = yes; then
    with_umfpack=no
!   AC_CHECK_HEADERS([sparsesuite/umfpack.h ufsparse/umfpack.h 
umfpack/umfpack.h umfpack.h], [
      AC_CHECK_LIB(umfpack, umfpack_zi_get_determinant, [
        UMFPACK_LIBS="-lumfpack"; with_umfpack=yes], [
          ## Invalidate the cache.
***************
*** 883,889 ****
  warn_colamd="COLAMD not found. This will result in some lack of functionality 
for sparse matrices."
  if test "$with_colamd" = yes; then
    with_colamd=no
!   AC_CHECK_HEADERS([ufsparse/colamd.h colamd/colamd.h colamd.h], [
      AC_CHECK_LIB(colamd, colamd, [COLAMD_LIBS="-lcolamd"; with_colamd=yes])
      if test "$with_colamd" = yes; then
        AC_DEFINE(HAVE_COLAMD, 1, [Define if the COLAMD library is used.])
--- 883,889 ----
  warn_colamd="COLAMD not found. This will result in some lack of functionality 
for sparse matrices."
  if test "$with_colamd" = yes; then
    with_colamd=no
!   AC_CHECK_HEADERS([sparsesuite/colamd.h ufsparse/colamd.h colamd/colamd.h 
colamd.h], [
      AC_CHECK_LIB(colamd, colamd, [COLAMD_LIBS="-lcolamd"; with_colamd=yes])
      if test "$with_colamd" = yes; then
        AC_DEFINE(HAVE_COLAMD, 1, [Define if the COLAMD library is used.])
***************
*** 909,915 ****
  warn_ccolamd="CCOLAMD not found. This will result in some lack of 
functionality for sparse matrices."
  if test "$with_ccolamd" = yes; then
    with_ccolamd=no
!   AC_CHECK_HEADERS([ufsparse/ccolamd.h ccolamd/ccolamd.h ccolamd.h], [
      AC_CHECK_LIB(ccolamd, ccolamd, [CCOLAMD_LIBS="-lccolamd"; 
with_ccolamd=yes])
      if test "$with_ccolamd" = yes; then
        AC_DEFINE(HAVE_CCOLAMD, 1, [Define if the CCOLAMD library is used.])
--- 909,915 ----
  warn_ccolamd="CCOLAMD not found. This will result in some lack of 
functionality for sparse matrices."
  if test "$with_ccolamd" = yes; then
    with_ccolamd=no
!   AC_CHECK_HEADERS([sparsesuite/ccolamd.h ufsparse/ccolamd.h 
ccolamd/ccolamd.h ccolamd.h], [
      AC_CHECK_LIB(ccolamd, ccolamd, [CCOLAMD_LIBS="-lccolamd"; 
with_ccolamd=yes])
      if test "$with_ccolamd" = yes; then
        AC_DEFINE(HAVE_CCOLAMD, 1, [Define if the CCOLAMD library is used.])
***************
*** 933,940 ****
  if test "$with_cholmod" = yes && test "$with_colamd" = yes &&
        test "$with_ccolamd" = yes && test "$with_amd" = yes; then
    with_cholmod=no
!   AC_CHECK_HEADERS([ufsparse/cholmod.h cholmod/cholmod.h cholmod.h], [
!     AC_CHECK_HEADERS([ufsparse/metis.h metis/metis.h metis.h], [
        AC_CHECK_LIB(metis, METIS_NodeND, with_metis=yes, with_metis=no)
        break],
        with_metis=no)
--- 933,940 ----
  if test "$with_cholmod" = yes && test "$with_colamd" = yes &&
        test "$with_ccolamd" = yes && test "$with_amd" = yes; then
    with_cholmod=no
!   AC_CHECK_HEADERS([sparsesuite/cholmod.h ufsparse/cholmod.h 
cholmod/cholmod.h cholmod.h], [
!     AC_CHECK_HEADERS([sparsesuite/metis.h ufsparse/metis.h metis/metis.h 
metis.h], [
        AC_CHECK_LIB(metis, METIS_NodeND, with_metis=yes, with_metis=no)
        break],
        with_metis=no)
***************
*** 980,986 ****
  warn_cxsparse="CXSparse not found. This will result in some lack of 
functionality for sparse matrices."
  if test "$with_cxsparse" = yes; then
    with_cxsparse=no
!   AC_CHECK_HEADERS([ufsparse/cs.h cxsparse/cs.h cs.h], [
      AC_CHECK_LIB(cxsparse, cs_di_sqr, [CXSPARSE_LIBS="-lcxsparse"; 
with_cxsparse=yes])
      if test "$with_cxsparse" = yes; then
        AC_DEFINE(HAVE_CXSPARSE, 1, [Define if the CXSparse library is used.])
--- 980,986 ----
  warn_cxsparse="CXSparse not found. This will result in some lack of 
functionality for sparse matrices."
  if test "$with_cxsparse" = yes; then
    with_cxsparse=no
!   AC_CHECK_HEADERS([sparsesuite/cs.h ufsparse/cs.h cxsparse/cs.h cs.h], [
      AC_CHECK_LIB(cxsparse, cs_di_sqr, [CXSPARSE_LIBS="-lcxsparse"; 
with_cxsparse=yes])
      if test "$with_cxsparse" = yes; then
        AC_DEFINE(HAVE_CXSPARSE, 1, [Define if the CXSparse library is used.])