Mercurial > hg > octave-nkf

comparison m4/acinclude.m4 @ 15329:719ffb2f35a6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix Octave builds with SuiteSparse >=4.0 (bug #37031) * configure.ac: Call OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME to check if UMFPACK needs SuiteSparse_time function. If it does, use AC_SEARCH_LIBS to find a possible library. * m4/acinclude.m4: Add new macro OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME.
author Rik <rik@octave.org>
date Fri, 07 Sep 2012 17:05:12 -0700
parents daf74ce2afdc
children 81cc4e5733b1
comparison
equal deleted inserted replaced
15328:efbc896c1ecc 15329:719ffb2f35a6
1622 ])dnl 1622 ])dnl
1623 AC_MSG_RESULT([defining $1 to be $$1]) 1623 AC_MSG_RESULT([defining $1 to be $$1])
1624 AC_SUBST($1) 1624 AC_SUBST($1)
1625 ]) 1625 ])
1626 dnl 1626 dnl
1627 dnl Check whether SuiteSparse_time is required by UMFPACK.
1628 dnl UMFPACK >= 4 requires linking in another library for SuiteSparse_time.
1629 dnl
1630 dnl Macro assumes that the check for umfpack has already been performed.
1631 dnl
1632 AC_DEFUN([OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME], [
1633 AC_CACHE_CHECK([whether UMFPACK needs SuiteSparse_time function],
1634 [octave_cv_umfpack_need_suitesparse_time],
1635 [AC_LANG_PUSH(C)
1636 AC_LINK_IFELSE([AC_LANG_PROGRAM([[
1637 #if defined (HAVE_SUITESPARSE_UMFPACK_H)
1638 # include <suitesparse/umfpack.h>
1639 #elif defined (HAVE_UFSPARSE_UMFPACK_H)
1640 # include <ufsparse/umfpack.h>
1641 #elif defined (HAVE_UMFPACK_UMFPACK_H)
1642 # include <umfpack/umfpack.h>
1643 #elif defined (HAVE_UMFPACK_H)
1644 # include <umfpack.h>
1645 #endif
1646 ]], [[
1647 double stats [2];
1648 umfpack_tic (stats);
1649 ]])],
1650 octave_cv_umfpack_need_suitesparse_time=no,
1651 octave_cv_umfpack_need_suitesparse_time=yes)
1652 AC_LANG_POP(C)
1653 ])
1654 ])
1655 dnl
1627 dnl Check for UMFPACK separately split complex matrix and RHS. 1656 dnl Check for UMFPACK separately split complex matrix and RHS.
1628 dnl 1657 dnl
1629 dnl Macro assumes that the check for umfpack has already been performed. 1658 dnl Macro assumes that the check for umfpack has already been performed.
1630 dnl 1659 dnl
1631 AC_DEFUN([OCTAVE_UMFPACK_SEPARATE_SPLIT], [ 1660 AC_DEFUN([OCTAVE_UMFPACK_SEPARATE_SPLIT], [