From 3ddf930b423c1b5ad77cc2ae737808bc59e1c366 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Atgeirr=20Fl=C3=B8=20Rasmussen?= Date: Tue, 13 Dec 2011 10:26:31 +0100 Subject: [PATCH] Now works with suitesparse on CentOS 5.7. --- configure.ac | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/configure.ac b/configure.ac index 4d0b2126..b67a70b4 100644 --- a/configure.ac +++ b/configure.ac @@ -33,10 +33,6 @@ AX_LAPACK # Checks for header files. AC_CHECK_HEADERS([float.h limits.h stddef.h stdlib.h string.h]) -AC_CHECK_HEADERS([suitesparse/umfpack.h], - [umfpack_header=yes], - [umfpack_header=no]) - # Checks for typedefs, structures, and compiler characteristics. AC_HEADER_STDBOOL AC_TYPE_SIZE_T @@ -45,8 +41,17 @@ AC_CHECK_TYPES([ptrdiff_t]) # Checks for library functions. AC_CHECK_FUNCS([floor memmove pow sqrt strchr strtol]) + +# To use UMFPACK, we need the header, and both the AMD and UMFPACK libs. +AC_CHECK_HEADERS([suitesparse/umfpack.h], + [umfpack_header=yes], + [umfpack_header=no]) + +AC_SEARCH_LIBS([amd_free], [amd], + [amd_lib=yes], [amd_lib=no], [-lm]) + AC_SEARCH_LIBS([umfpack_dl_solve], [umfpack], - [umfpack_lib=yes], [umfpack_lib=no]) + [umfpack_lib=yes], [umfpack_lib=no], [-lamd -lm]) AM_CONDITIONAL([UMFPACK], [test "x$umfpack_header" != "xno" -a "x$umfpack_lib" != "xno"])