Mercurial > octave-nkf
changeset 5222:8d95c4573f96
[project @ 2005-03-17 16:15:25 by jwe]
| author | jwe |
|---|---|
| date | Thu, 17 Mar 2005 16:15:25 +0000 |
| parents | 843ac57f254a |
| children | ef1ac9acc43e |
| files | ChangeLog configure.in |
| diffstat | 2 files changed, 11 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 17 04:53:06 2005 +0000 +++ b/ChangeLog Thu Mar 17 16:15:25 2005 +0000 @@ -1,5 +1,8 @@ 2005-03-17 John W. Eaton <jwe@octave.org> + * configure.in: If first check for -lumfpack fails try again with + -lcblas as an additional library. + * configure.in: Change defaults to enable shared libraries and dynamic linking and disable static libraries. @@ -31,7 +34,7 @@ 2005-03-10 John W. Eaton <jwe@octave.org> * mkoctfile.in: Accept -R DIR. -p + 2005-03-09 John W. Eaton <jwe@octave.org> * examples/Makefile.in (bin-dist): Delete target.
--- a/configure.in Thu Mar 17 04:53:06 2005 +0000 +++ b/configure.in Thu Mar 17 16:15:25 2005 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.466 $) +AC_REVISION($Revision: 1.467 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -448,7 +448,12 @@ LIBS="-lamd $LIBS" AC_CHECK_LIB(umfpack, umfpack_zi_get_determinant, [ LIBS="-lumfpack $LIBS" - UMFPACK_LIBS="-lumfpack"; with_umfpack=yes])]) + UMFPACK_LIBS="-lumfpack"; with_umfpack=yes], [ + ## Invalidate the cache. + $as_unset ac_cv_lib_umfpack_umfpack_zi_get_determinant + AC_CHECK_LIB(umfpack, umfpack_zi_get_determinant, [ + LIBS="-lumfpack -lcblas $LIBS" + UMFPACK_LIBS="-lumfpack -lcblas"; with_umfpack=yes], [], -lcblas)])]) 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