# HG changeset patch # User Rik # Date 1347375337 25200 # Node ID 90c2b2d777bf29c3941b0113c8402ef762705f12 # Parent 450fedd441760065b59b909b12a89b1d3f55ce3d configure.ac: Fix building of Octave with ancient versions of SuiteSparse (3.2.X) *configure.ac: Link in additional libs AMD and BLAS when running SuiteSparse configure tests. diff --git a/configure.ac b/configure.ac --- a/configure.ac +++ b/configure.ac @@ -1331,7 +1331,7 @@ if test -n "$UMFPACK_LIBS"; then ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time() save_LIBS="$LIBS"; - LIBS="$UMFPACK_LIBS $FLIBS $LIBS" + LIBS="$UMFPACK_LIBS $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" xtra_libs= OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME if test "$octave_cv_umfpack_need_suitesparse_time" = yes; then @@ -1357,7 +1357,7 @@ ## Check for UMFPACK separately split complex matrix and RHS. if test -n "$UMFPACK_LIBS"; then save_LIBS="$LIBS"; - LIBS="$UMFPACK_LIBS $CHOLMOD_LIBS $AMD_LIBS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs" + LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs" OCTAVE_UMFPACK_SEPARATE_SPLIT LIBS="$save_LIBS" fi