Mercurial > octave-nkf

comparison configure.ac @ 18270:75d7cde2dda4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
maint: Merge gui-release -> stable.
author Rik <rik@octave.org>
date Mon, 13 Jan 2014 10:49:22 -0800
parents 3cad99b56fa7 f227bb47314f
children a0c9f5302eae
comparison
equal deleted inserted replaced
18263:b5be1a2aa5ab 18270:75d7cde2dda4
1526 1526
1527 ## Test features of the installed UMFPACK library 1527 ## Test features of the installed UMFPACK library
1528 1528
1529 if test -n "$UMFPACK_LIBS"; then 1529 if test -n "$UMFPACK_LIBS"; then
1530 ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time() 1530 ## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time()
1531 save_CPPFLAGS="$CPPFLAGS"
1531 save_LIBS="$LIBS"; 1532 save_LIBS="$LIBS";
1533 CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS"
1532 LIBS="$UMFPACK_LIBS $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS" 1534 LIBS="$UMFPACK_LIBS $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS"
1533 xtra_libs= 1535 xtra_libs=
1534 OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME 1536 OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME
1535 if test $octave_cv_umfpack_need_suitesparse_time = yes; then 1537 if test $octave_cv_umfpack_need_suitesparse_time = yes; then
1536 AC_CHECK_LIB([rt], [clock_gettime], [xtra_libs="-lrt"], [xtra_libs=]) 1538 AC_CHECK_LIB([rt], [clock_gettime], [xtra_libs="-lrt"], [xtra_libs=])
1549 AC_MSG_WARN([UMFPACK library will be disabled.]) 1551 AC_MSG_WARN([UMFPACK library will be disabled.])
1550 ;; 1552 ;;
1551 esac 1553 esac
1552 fi 1554 fi
1553 LIBS="$save_LIBS" 1555 LIBS="$save_LIBS"
1556 CPPFLAGS="$save_CPPFLAGS"
1554 1557
1555 ## Check for UMFPACK separately split complex matrix and RHS. 1558 ## Check for UMFPACK separately split complex matrix and RHS.
1556 if test -n "$UMFPACK_LIBS"; then 1559 if test -n "$UMFPACK_LIBS"; then
1560 save_CPPFLAGS="$CPPFLAGS"
1557 save_LIBS="$LIBS"; 1561 save_LIBS="$LIBS";
1562 CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS"
1558 LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs" 1563 LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs"
1559 OCTAVE_UMFPACK_SEPARATE_SPLIT 1564 OCTAVE_UMFPACK_SEPARATE_SPLIT
1560 LIBS="$save_LIBS" 1565 LIBS="$save_LIBS"
1566 CPPFLAGS="$save_CPPFLAGS"
1561 fi 1567 fi
1562 fi 1568 fi
1563 1569
1564 ### Check for ARPACK library. 1570 ### Check for ARPACK library.
1565 1571
2176 AC_CHECK_FUNCS([isascii kill]) 2182 AC_CHECK_FUNCS([isascii kill])
2177 AC_CHECK_FUNCS([lgamma lgammaf lgamma_r lgammaf_r]) 2183 AC_CHECK_FUNCS([lgamma lgammaf lgamma_r lgammaf_r])
2178 AC_CHECK_FUNCS([log1p log1pf pipe]) 2184 AC_CHECK_FUNCS([log1p log1pf pipe])
2179 AC_CHECK_FUNCS([realpath resolvepath roundl]) 2185 AC_CHECK_FUNCS([realpath resolvepath roundl])
2180 AC_CHECK_FUNCS([select setgrent setpwent siglongjmp strsignal]) 2186 AC_CHECK_FUNCS([select setgrent setpwent siglongjmp strsignal])
2181 AC_CHECK_FUNCS([tempnam tgammaf toascii]) 2187 AC_CHECK_FUNCS([tcgetattr tcsetattr tempnam tgammaf toascii])
2182 AC_CHECK_FUNCS([umask waitpid]) 2188 AC_CHECK_FUNCS([umask waitpid])
2183 AC_CHECK_FUNCS([_kbhit]) 2189 AC_CHECK_FUNCS([_kbhit])
2184 2190
2185 dnl There are no workarounds in the code for missing these functions. 2191 dnl There are no workarounds in the code for missing these functions.
2186 AC_CHECK_FUNCS([modf pow sqrt sqrtf], [], 2192 AC_CHECK_FUNCS([modf pow sqrt sqrtf], [],