Mercurial > octave-nkf

changeset 18266:975480e1be4b stable

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209). * configure.ac: Add AMD_CPPFLAGS to UMFPACK tests (bug #41209).
author Kyle Guinn <elyk03@gmail.com>
date Mon, 13 Jan 2014 08:10:00 -0800
parents 91805d8ab62f
children f227bb47314f 0ab9c475300a
files configure.ac
diffstat 1 files changed, 6 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/configure.ac	Sun Jan 12 17:55:29 2014 -0500
+++ b/configure.ac	Mon Jan 13 08:10:00 2014 -0800
@@ -1536,7 +1536,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
@@ -1559,13 +1561,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