Mercurial > octave-dspies

comparison configure.ac @ 15349:90c2b2d777bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Rik <rik@octave.org>
date Tue, 11 Sep 2012 07:55:37 -0700
parents 6bdf379592d9
children 6a0c0d3d60b6
comparison
equal deleted inserted replaced
15348:450fedd44176 15349:90c2b2d777bf
1329 ## Test features of the installed UMFPACK library 1329 ## Test features of the installed UMFPACK library
1330 1330
1331 if test -n "$UMFPACK_LIBS"; then 1331 if test -n "$UMFPACK_LIBS"; then
1332 ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time() 1332 ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time()
1333 save_LIBS="$LIBS"; 1333 save_LIBS="$LIBS";
1334 LIBS="$UMFPACK_LIBS $FLIBS $LIBS" 1334 LIBS="$UMFPACK_LIBS $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS"
1335 xtra_libs= 1335 xtra_libs=
1336 OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME 1336 OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME
1337 if test "$octave_cv_umfpack_need_suitesparse_time" = yes; then 1337 if test "$octave_cv_umfpack_need_suitesparse_time" = yes; then
1338 AC_CHECK_LIB([rt], [clock_gettime], [xtra_libs="-lrt"], [xtra_libs=]) 1338 AC_CHECK_LIB([rt], [clock_gettime], [xtra_libs="-lrt"], [xtra_libs=])
1339 ## FIXME: This library list is only accurate for Linux, Mac OS X. 1339 ## FIXME: This library list is only accurate for Linux, Mac OS X.
1355 LIBS="$save_LIBS" 1355 LIBS="$save_LIBS"
1356 1356
1357 ## Check for UMFPACK separately split complex matrix and RHS. 1357 ## Check for UMFPACK separately split complex matrix and RHS.
1358 if test -n "$UMFPACK_LIBS"; then 1358 if test -n "$UMFPACK_LIBS"; then
1359 save_LIBS="$LIBS"; 1359 save_LIBS="$LIBS";
1360 LIBS="$UMFPACK_LIBS $CHOLMOD_LIBS $AMD_LIBS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs" 1360 LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs"
1361 OCTAVE_UMFPACK_SEPARATE_SPLIT 1361 OCTAVE_UMFPACK_SEPARATE_SPLIT
1362 LIBS="$save_LIBS" 1362 LIBS="$save_LIBS"
1363 fi 1363 fi
1364 fi 1364 fi
1365 1365