Re: Help compiling CVS 2.9.3

[John W. Eaton]

On 28-Oct-2005, Quentin Spencer wrote:

| Index: configure.in
| ===================================================================
| RCS file: /cvs/octave/configure.in,v
| retrieving revision 1.491
| diff -u -r1.491 configure.in
| --- a/configure.in 27 Oct 2005 02:44:43 -0000 1.491
| +++ b/configure.in 28 Oct 2005 21:10:08 -0000
| @@ -836,14 +836,14 @@
| with_cholmod=yes], [
| AC_CHECK_LIB(cholmod_start, cholmod,
| [CHOLMOD_LIBS="-lcholmod -cblas -lmetis"; with_cholmod=yes], [],
| - AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS -lmetis)],
| + $AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS -lmetis)],
| $AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS -lmetis)
| else
| AC_CHECK_LIB(cholmod, cholmod_start, [CHOLMOD_LIBS="-lcholmod";
| with_cholmod=yes], [
| AC_CHECK_LIB(cholmod_start, cholmod, [CHOLMOD_LIBS="-lcholmod -cblas";
| with_cholmod=yes], [],
| - AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS)],
| + $AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS)],
| $AMD_LIBS $COLAMD_LIBS $CCOLAMD_LIBS $BLAS_LIBS $FLIBS)
| fi
| 
| Index: liboctave/oct-sparse.h
| ===================================================================
| RCS file: /cvs/octave/liboctave/oct-sparse.h,v
| retrieving revision 1.1
| diff -u -r1.1 oct-sparse.h
| --- a/liboctave/oct-sparse.h 27 Oct 2005 02:20:17 -0000 1.1
| +++ b/liboctave/oct-sparse.h 28 Oct 2005 21:10:11 -0000
| @@ -32,7 +32,7 @@
| extern "C" {
| #endif
| 
| -#if defined (HAVE_UFSPARSE_UMFPACK_h)
| +#if defined (HAVE_UFSPARSE_UMFPACK_H)
| #include <ufsparse/umfpack.h>
| #elif defined (HAVE_UMFPACK_UMFPACK_H)
| #include <umfpack/umfpack.h>

I made these changes in my sources.

Thanks,

jwe



-------------------------------------------------------------
Octave is freely available under the terms of the GNU GPL.

Octave's home on the web:  http://www.octave.org
How to fund new projects:  http://www.octave.org/funding.html
Subscription information:  http://www.octave.org/archive.html
-------------------------------------------------------------