Permalink
Browse files

Added cholmod as a dependency for ASP (linux only)

Techinically it's a dependency for the OSX version as well. However
OSX will never need to resolve those symbols because in ASP we never
use a part of ISIS that uses CHOLMOD.
  • Loading branch information...
1 parent 78ca692 commit 3d7a28eedac57696b63796c249b4e42f50e5bd09 Zachary Moratto committed Oct 20, 2011
Showing with 5 additions and 1 deletion.
  1. +5 −1 configure.ac
View
@@ -299,6 +299,10 @@ AX_PKG_ONE_OF(GSL,
AX_PKG(CURL, [], [-lcurl])
AX_PKG(GEOS, [], [-lgeos])
AX_PKG(XERCESC, [CURL], [-lxerces-c])
+AX_PKG(UFCONFIG, [], [-lufconfig])
+AX_PKG(AMD, [UFCONFIG], [-lamd])
+AX_PKG(COLAMD, [UFCONFIG], [-lcolamd])
+AX_PKG(CHOLMOD, [AMD COLAMD], [-lcholmod])
AX_PKG_ONE_OF(SUPERLU,
SUPERLU_STATIC, [AX_PKG(SUPERLU_STATIC, [LAPACK], [-lyou_should_override_me])],
@@ -312,7 +316,7 @@ AX_PKG_ONE_OF(KAKADU,
if test x"$host_vendor" = "xapple"; then
AX_PKG(ISIS3RDPARTY, [LAPACK GSL QWT GEOS SPICE XERCESC PROTOBUF], [],[],[],[],[],[KAKADU])
else
- AX_PKG(ISIS3RDPARTY, [LAPACK GSL QWT GEOS SPICE XERCESC SUPERLU PROTOBUF],[],[],[],[],[],[KAKADU])
+ AX_PKG(ISIS3RDPARTY, [LAPACK GSL QWT GEOS SPICE XERCESC SUPERLU PROTOBUF CHOLMOD],[],[],[],[],[],[KAKADU])
fi
AX_PKG(ISIS, [ISIS3RDPARTY QT], [-lisis3], [SpecialPixel.h])

0 comments on commit 3d7a28e

Please sign in to comment.