Mercurial > octave-nkf
changeset 5226:316ddaa7ae5b
[project @ 2005-03-18 01:54:24 by jwe]
| author | jwe |
|---|---|
| date | Fri, 18 Mar 2005 01:54:24 +0000 |
| parents | 6434e63553f0 |
| children | 6c4677ba0784 |
| files | ChangeLog configure.in |
| diffstat | 2 files changed, 48 insertions(+), 44 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Mar 17 17:53:01 2005 +0000 +++ b/ChangeLog Fri Mar 18 01:54:24 2005 +0000 @@ -1,3 +1,7 @@ +2005-03-17 Shan G. Smith <shan@cybertrails.com> + + * configure.in: Move check for -lumfpack to after check for blas. + 2005-03-17 John W. Eaton <jwe@octave.org> * configure.in: If first check for -lumfpack fails try again with
--- a/configure.in Thu Mar 17 17:53:01 2005 +0000 +++ b/configure.in Fri Mar 18 01:54:24 2005 +0000 @@ -29,7 +29,7 @@ EXTERN_CXXFLAGS="$CXXFLAGS" AC_INIT -AC_REVISION($Revision: 1.467 $) +AC_REVISION($Revision: 1.468 $) AC_PREREQ(2.57) AC_CONFIG_SRCDIR([src/octave.cc]) AC_CONFIG_HEADER(config.h) @@ -430,49 +430,6 @@ AC_DEFINE(HAVE_FFTW3, 1, [Define if the FFTW3 library is used.]) fi -# Check for UMFPACK library. - -UMFPACK_LIBS= -AC_SUBST(UMFPACK_LIBS) - -AC_ARG_WITH(umfpack, - [ --without-umfpack don't use UMFPACK, disable some sparse functionality], - with_umfpack=$withval, with_umfpack=yes) - -if test "$with_umfpack" = "yes"; then - have_umfpack_header=no - with_umfpack=no - AC_CHECK_HEADER(umfpack/umfpack.h, [have_umfpack_header=yes; break]) - if test "$have_umfpack_header" = yes; then - AC_CHECK_LIB(amd, amd_postorder, [ - LIBS="-lamd $LIBS" - AC_CHECK_LIB(umfpack, umfpack_zi_get_determinant, [ - LIBS="-lumfpack $LIBS" - 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 - # numbers as there is no interface changes that are visible at - # compile time. - with_umfpack_split=no - fi - fi -fi - -if test "$with_umfpack" = yes; then - AC_DEFINE(HAVE_UMFPACK, 1, [Define if the UMFPACK library is used.]) - if test "$with_umfpack_split" = yes; then - AC_DEFINE(UMFPACK_SEPARATE_SPLIT, 1, [Define if the UMFPACK Complex solver allow matrix and RHS to be split independently]) - fi -else - warn_umfpack="UMFPACK not found. This will result in some lack of functionality for sparse matrices." -fi - WITH_MPI=true AC_ARG_WITH(mpi, [ --without-mpi don't use MPI], @@ -656,6 +613,49 @@ AC_SUBST(BLAS_DIR) AC_SUBST(LAPACK_DIR) +# Check for UMFPACK library. + +UMFPACK_LIBS= +AC_SUBST(UMFPACK_LIBS) + +AC_ARG_WITH(umfpack, + [ --without-umfpack don't use UMFPACK, disable some sparse functionality], + with_umfpack=$withval, with_umfpack=yes) + +if test "$with_umfpack" = "yes"; then + have_umfpack_header=no + with_umfpack=no + AC_CHECK_HEADER(umfpack/umfpack.h, [have_umfpack_header=yes; break]) + if test "$have_umfpack_header" = yes; then + AC_CHECK_LIB(amd, amd_postorder, [ + LIBS="-lamd $LIBS" + AC_CHECK_LIB(umfpack, umfpack_zi_get_determinant, [ + LIBS="-lumfpack $LIBS" + 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 + # numbers as there is no interface changes that are visible at + # compile time. + with_umfpack_split=no + fi + fi +fi + +if test "$with_umfpack" = yes; then + AC_DEFINE(HAVE_UMFPACK, 1, [Define if the UMFPACK library is used.]) + if test "$with_umfpack_split" = yes; then + AC_DEFINE(UMFPACK_SEPARATE_SPLIT, 1, [Define if the UMFPACK Complex solver allow matrix and RHS to be split independently]) + fi +else + warn_umfpack="UMFPACK not found. This will result in some lack of functionality for sparse matrices." +fi + ### Handle shared library options. ### Enable creation of static libraries.