comparison configure.ac @ 15350:6a0c0d3d60b6

build: Implement some caching for OCTAVE_CHECK_LIB macro. * configure.ac: Update variable names that have changed in OCTAVE_CHECK_LIB. * acinclude.m4 (OCTAVE_CHECK_LIB): Implement caching for the library check portion of macro.
author Rik <rik@octave.org>
date Tue, 11 Sep 2012 10:30:32 -0700
parents 90c2b2d777bf
children 01c4f5d8a656
comparison
equal deleted inserted replaced
15349:90c2b2d777bf 15350:6a0c0d3d60b6
1228 [qrupdate not found. The QR & Cholesky updating functions will be slow.], 1228 [qrupdate not found. The QR & Cholesky updating functions will be slow.],
1229 [], 1229 [],
1230 [sqr1up], 1230 [sqr1up],
1231 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) 1231 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions])
1232 1232
1233 if test "$octave_qrupdate_ok" = yes; then 1233 if test "$octave_cv_lib_qrupdate" = yes; then
1234 LIBS="$LIBS $QRUPDATE_LIBS" 1234 LIBS="$LIBS $QRUPDATE_LIBS"
1235 AC_LANG_PUSH([Fortran 77]) 1235 AC_LANG_PUSH([Fortran 77])
1236 AC_MSG_CHECKING([for slup1up in $QRUPDATE_LIBS]) 1236 AC_MSG_CHECKING([for slup1up in $QRUPDATE_LIBS])
1237 octave_qrupdate_luu=no 1237 octave_qrupdate_luu=no
1238 AC_LINK_IFELSE([AC_LANG_CALL([], [slup1up])], [octave_qrupdate_luu=yes]) 1238 AC_LINK_IFELSE([AC_LANG_CALL([], [slup1up])], [octave_qrupdate_luu=yes])
1311 LIBS="$save_LIBS" 1311 LIBS="$save_LIBS"
1312 1312
1313 if test -z "$UMFPACK_LIBS"; then 1313 if test -z "$UMFPACK_LIBS"; then
1314 ## Invalidate the cache and try again with -lcblas. 1314 ## Invalidate the cache and try again with -lcblas.
1315 $as_unset ac_cv_lib_umfpack_umfpack_zi_get_determinant 1315 $as_unset ac_cv_lib_umfpack_umfpack_zi_get_determinant
1316 $as_unset octave_cv_lib_umfpack
1316 save_LIBS="$LIBS" 1317 save_LIBS="$LIBS"
1317 LIBS="-lcblas $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" 1318 LIBS="-lcblas $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS"
1318 OCTAVE_CHECK_LIB([umfpack], UMFPACK, 1319 OCTAVE_CHECK_LIB([umfpack], UMFPACK,
1319 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.], 1320 [UMFPACK not found. This will result in some lack of functionality for sparse matrices.],
1320 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h], 1321 [suitesparse/umfpack.h ufsparse/umfpack.h umfpack/umfpack.h umfpack.h],