# HG changeset patch # User jwe # Date 1115055727 0 # Node ID f88f21827fe5f35e9367325e4aed0e42e80e8d0e # Parent f087ea85c24b2c11990200564b9af0cf7183e8a9 [project @ 2005-05-02 17:41:00 by jwe] diff -r f087ea85c24b -r f88f21827fe5 ChangeLog --- a/ChangeLog Mon May 02 11:09:48 2005 +0000 +++ b/ChangeLog Mon May 02 17:42:07 2005 +0000 @@ -1,3 +1,8 @@ +2005-05-02 John W. Eaton + + * configure.in (AC_ARG_WITH(umfpack)): List -lumfpack ahead of -lamd. + From Dmitri A. Sergatskov . + 2005-04-29 David Bateman * configure.in: Add UMFPACK_LONG_IDX diff -r f087ea85c24b -r f88f21827fe5 configure.in --- a/configure.in Mon May 02 11:09:48 2005 +0000 +++ b/configure.in Mon May 02 17:42:07 2005 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.475 $) +AC_REVISION($Revision: 1.476 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -713,16 +713,16 @@ if test "$have_umfpack_header" = yes; then AC_CHECK_LIB(amd, amd_postorder, [ AC_CHECK_LIB(umfpack, umfpack_zi_get_determinant, [ - UMFPACK_LIBS="-lamd -lumfpack"; with_umfpack=yes], [ + UMFPACK_LIBS="-lumfpack -lamd"; with_umfpack=yes], [ ## Invalidate the cache. $as_unset ac_cv_lib_umfpack_umfpack_zi_get_determinant AC_CHECK_LIB(umfpack, umfpack_zi_get_determinant, [ - UMFPACK_LIBS="-lamd -lumfpack"; with_umfpack=yes], [ + UMFPACK_LIBS="-lumfpack -lamd"; with_umfpack=yes], [ ## Invalidate the cache. $as_unset ac_cv_lib_umfpack_umfpack_zi_get_determinant AC_CHECK_LIB(umfpack, umfpack_zi_get_determinant, [ - UMFPACK_LIBS="-lamd -lumfpack -lcblas"; with_umfpack=yes], [], -lamd -lcblas $BLAS_LIBS)], -lamd $BLAS_LIBS $FLIBS)]), -lamd]) + UMFPACK_LIBS="-lumfpack -lamd -lcblas"; with_umfpack=yes], [], -lamd -lcblas $BLAS_LIBS)], -lamd $BLAS_LIBS $FLIBS)]), -lamd]) if test "$with_umfpack" = yes; then # For now the code needed for this is not in umfpack, will add # a test later that will probably have to be based on version diff -r f087ea85c24b -r f88f21827fe5 liboctave/ChangeLog --- a/liboctave/ChangeLog Mon May 02 11:09:48 2005 +0000 +++ b/liboctave/ChangeLog Mon May 02 17:42:07 2005 +0000 @@ -1,36 +1,43 @@ +2005-05-02 John W. Eaton + + * Makefile.in (LINK_DEPS): List $(UMFPACK_LIBS) ahead of $(BLAS_LIBS). + From Dmitri A. Sergatskov . + 2005-04-29 David Bateman - * dSparse.cc (trisolve): Diagonal passed to lapack zptsv is type double. - Correct indexing for upper diagonal elements for sparse tridiagonal. + * dSparse.cc (trisolve): Diagonal passed to lapack zptsv is type + double. Correct indexing for upper diagonal elements for sparse + tridiagonal. * CSparse.cc (trisolve): ditto. - * CSparse.h (UMFPACK_ZNAME): Define macro to pick version of UMFPACK for - 64-bit. + * CSparse.h (UMFPACK_ZNAME): Define macro to pick version of + UMFPACK for 64-bit. * CSparse.cc (UMFPACK_ZNAME): Replace all umfpack_zi_* with UMFPACK_ZNAME(*). * SparseCmplxLU.cc (UMFPACK_ZNAME): ditto - * dSparse.h (UMFPACK_DNAME): Define macro to pick version of UMFPACK for - 64-bit. + * dSparse.h (UMFPACK_DNAME): Define macro to pick version of + UMFPACK for 64-bit. * dSparse.cc (UMFPACK_DNAME): Replace all umfpack_di_* with UMFPACK_DNAME(*). * SparsedbleLU.cc (UMFPACK_DNAME): ditto - * dSparse.cc (ltsolve, utsolve): Correct permuted upper/lower triangular - back/forward substitution code. + * dSparse.cc (ltsolve, utsolve): Correct permuted upper/lower + triangular back/forward substitution code. * CSparse.cc (ltsolve, utsolve): ditto. - * dSparse.cc (solve): Use mattype.type (false) to force messaging from - spparms("spumoni",1). + * dSparse.cc (solve): Use mattype.type (false) to force messaging + from spparms("spumoni",1). * CSparse.cc (solve): ditto - * SparseType.cc (SparseType(void)): Print info for spparms("spumoni",1). + * SparseType.cc (SparseType(void)): Print info for + spparms("spumoni",1). (SparseType(const matrix_type), SparseType(const matrix_type, const octave_idx_type, const octave_idx_type*), SparseType(const matrix_type, const octave_idx_type, const octave_idx_type)): New constructors. (SparseType (const SparseMatrix&), SparseType (SparseComplexMatrix&)): - Detect row permuted lower triangular and column permuted upper triangular - matrices. Remove one of the permutation vectors.. + Detect row permuted lower triangular and column permuted upper + triangular matrices. Remove one of the permutation vectors.. * SparseType.h: Simplify the permutation code. (SparseType(const matrix_type), SparseType diff -r f087ea85c24b -r f88f21827fe5 liboctave/Makefile.in --- a/liboctave/Makefile.in Mon May 02 11:09:48 2005 +0000 +++ b/liboctave/Makefile.in Mon May 02 17:42:07 2005 +0000 @@ -20,7 +20,7 @@ LINK_DEPS = \ -L../libcruft -L../glob -L. $(RLD_FLAG) \ - $(LIBCRUFT) $(BLAS_LIBS) $(FFTW_LIBS) $(UMFPACK_LIBS) $(LIBREADLINE) \ + $(LIBCRUFT) $(UMFPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBREADLINE) \ $(LIBS) $(FLIBS) include $(srcdir)/COLAMD.files diff -r f087ea85c24b -r f88f21827fe5 src/ChangeLog --- a/src/ChangeLog Mon May 02 11:09:48 2005 +0000 +++ b/src/ChangeLog Mon May 02 17:42:07 2005 +0000 @@ -1,3 +1,11 @@ +2005-05-02 John W. Eaton + + * Makefile.in (octave$(EXEEXT)): List $(UMFPACK_LIBS) ahead of + $(BLAS_LIBS). + (OCTAVE_LIBS): Include $(GLPK_LIBS) in the list if dynamic linking + is not enabled. + From Dmitri A. Sergatskov . + 2005-05-02 John W. Eaton * oct-map.h, oct-map.cc (Octave_map::seek, Octave_map::contents): diff -r f087ea85c24b -r f88f21827fe5 src/Makefile.in --- a/src/Makefile.in Mon May 02 11:09:48 2005 +0000 +++ b/src/Makefile.in Mon May 02 17:42:07 2005 +0000 @@ -235,16 +235,22 @@ OCTAVE_LFLAGS = -L$(TOPDIR)/liboctave -L$(TOPDIR)/libcruft \ -L$(TOPDIR)/src $(RLD_FLAG) -OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) \ - $(SPECIAL_MATH_LIB) $(LIBCRUFT) \ - $(LIBPLPLOT) $(LIBDLFCN) +if ($(ENABLE_DYNAMIC_LINKING), true) + OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) \ + $(SPECIAL_MATH_LIB) $(LIBCRUFT) \ + $(LIBPLPLOT) $(LIBDLFCN) +else + OCTAVE_LIBS = $(LIBOCTINTERP) $(LIBOCTAVE) \ + $(GLPK_LIBS) $(SPECIAL_MATH_LIB) $(LIBCRUFT) \ + $(LIBPLPLOT) $(LIBDLFCN) +endif OCTINTERP_LINK_DEPS = \ -L../liboctave $(LIBOCTAVE) -L../libcruft $(LIBCRUFT) $(LIBS) $(FLIBS) OCT_LINK_DEPS = \ -L../libcruft $(LIBCRUFT) -L../liboctave $(LIBOCTAVE) \ - -L. $(LIBOCTINTERP) $(BLAS_LIBS) $(FFTW_LIBS) $(UMFPACK_LIBS) $(LIBS) $(FLIBS) + -L. $(LIBOCTINTERP) $(UMFPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBS) $(FLIBS) DISTFILES = Makefile.in ChangeLog mkdefs mkops mkgendoc \ DOCSTRINGS mkbuiltins mk-oct-links \ @@ -310,7 +316,7 @@ main.o $(DLD_STATIC_OBJ) \ $(OCTAVE_LFLAGS) \ $(OCTAVE_LIBS) \ - $(LEXLIB) $(BLAS_LIBS) $(FFTW_LIBS) $(UMFPACK_LIBS) $(LIBS) $(FLIBS) + $(LEXLIB) $(UMFPACK_LIBS) $(BLAS_LIBS) $(FFTW_LIBS) $(LIBS) $(FLIBS) stmp-pic: pic @if [ -f stmp-pic ]; then \