Mercurial > octave-nkf

comparison configure.ac @ 19383:043440fa7006 stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Respect without-z and without-qrupdate options when config.cache exists. * configure.ac: Check that Z lib and QRUPDATE lib are desired, rather than the previous result in cache variable, to determine if AC_DEFINE should execute.
author Rik <rik@octave.org>
date Sun, 23 Nov 2014 15:15:02 -0800
parents 88847d5d1a96
children 98c7fa559d75 446c46af4b42
comparison
equal deleted inserted replaced
19381:2da8f0c6e8a3 19383:043440fa7006
782 OCTAVE_CHECK_LIB(z, ZLIB, 782 OCTAVE_CHECK_LIB(z, ZLIB,
783 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.], 783 [ZLIB library not found. Octave will not be able to save or load compressed data files or HDF5 files.],
784 [zlib.h], [gzclearerr]) 784 [zlib.h], [gzclearerr])
785 785
786 ### Also define HAVE_ZLIB if libz is found. 786 ### Also define HAVE_ZLIB if libz is found.
787 if test $octave_cv_lib_z = yes; then 787 if test -z "$warn_z"; then
788 AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if ZLIB is available.]) 788 AC_DEFINE(HAVE_ZLIB, 1, [Define to 1 if ZLIB is available.])
789 fi 789 fi
790 790
791 ### Check for the LLVM library 791 ### Check for the LLVM library
792 792
1426 [qrupdate not found. The QR & Cholesky updating functions will be slow.], 1426 [qrupdate not found. The QR & Cholesky updating functions will be slow.],
1427 [], 1427 [],
1428 [sqr1up], 1428 [sqr1up],
1429 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions]) 1429 [Fortran 77], [don't use qrupdate, disable QR & Cholesky updating functions])
1430 1430
1431 if test $octave_cv_lib_qrupdate = yes; then 1431 ## Additional check to see if qrupdate lib found supports LU updates
1432 if test -z "$warn_qrupdate"; then
1432 AC_CACHE_CHECK([for slup1up in $QRUPDATE_LIBS], 1433 AC_CACHE_CHECK([for slup1up in $QRUPDATE_LIBS],
1433 [octave_cv_func_slup1up], 1434 [octave_cv_func_slup1up],
1434 [LIBS="$LIBS $QRUPDATE_LIBS" 1435 [LIBS="$LIBS $QRUPDATE_LIBS"
1435 AC_LANG_PUSH([Fortran 77]) 1436 AC_LANG_PUSH([Fortran 77])
1436 AC_LINK_IFELSE([AC_LANG_CALL([], [slup1up])], 1437 AC_LINK_IFELSE([AC_LANG_CALL([], [slup1up])],