blob: d56ba1f8ebdf51f6af8d35b24aa7806dd5ef2a4f (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
|
diff --git a/configure.ac b/configure.ac
--- a/configure.ac
+++ b/configure.ac
@@ -1512,7 +1512,9 @@
if test -n "$UMFPACK_LIBS"; then
## SuiteSparse >= 4.0 needs additional link library for SuiteSparse_time()
+ save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS";
+ CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS"
LIBS="$UMFPACK_LIBS $AMD_LDFLAGS $AMD_LIBS $BLAS_LIBS $FLIBS $LIBS"
xtra_libs=
OCTAVE_UMFPACK_NEED_SUITESPARSE_TIME
@@ -1535,13 +1537,17 @@
esac
fi
LIBS="$save_LIBS"
+ CPPFLAGS="$save_CPPFLAGS"
## Check for UMFPACK separately split complex matrix and RHS.
if test -n "$UMFPACK_LIBS"; then
+ save_CPPFLAGS="$CPPFLAGS"
save_LIBS="$LIBS";
+ CPPFLAGS="$UMFPACK_CPPFLAGS $AMD_CPPFLAGS $CPPFLAGS"
LIBS="$UMFPACK_LIBS $CHOLMOD_LDFLAGS $CHOLMOD_LIBS $AMD_LDFLAGS $AMD_LIBS $COLAMD_LDFLAGS $COLAMD_LIBS $LAPACK_LIBS $BLAS_LIBS $FLIBS $LIBS $xtra_libs"
OCTAVE_UMFPACK_SEPARATE_SPLIT
LIBS="$save_LIBS"
+ CPPFLAGS="$save_CPPFLAGS"
fi
fi
|
