Changeset 589

Timestamp:

05/26/09 10:56:26 (16 years ago)

Author:

Eric.Larour

Message:

Added no-matlab dakota compilation

File:

• issm/trunk/m4/issm_options.m4 (modified) (3 diffs)

issm/trunk/m4/issm_options.m4

@@ -135 +135 @@
         fi
         AC_MSG_RESULT(ok)
-        
+
+        dnl Dakota directory
+        AC_ARG_WITH([dakota-dir],
+                          AS_HELP_STRING([--with-dakota-dir = DIR], [dakota root directory. necessary for serial build]),
+                         [DAKOTA_ROOT=$withval],[DAKOTA_ROOT=""]) 
+        AC_MSG_CHECKING(for Dakota )
+        
+        if test -d "$DAKOTA_ROOT"; then
+
+                dnl defaults
+                HAVE_DAKOTA=yes
+                DAKOTAINCL=-I$DAKOTA_ROOT/include
+                DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -lfftw3 -llhs  -levidence -lsurfpack -lconmin -lddace -lfsudace    -ljega -lcport -lopt -lpsuade -lnewmat    -lncsuopt -lgsl -lquadrature -lcoliny -lcolin -lpebbl     -lutilib -l3po -lnappspack -lappspack -lconveyor -lshared -lcdd -lamplsolver "
+
+
+                AC_DEFINE([_HAVE_DAKOTA_],[1],[with Dakota in ISSM src])
+                AC_SUBST([DAKOTAINCL])
+                AC_SUBST([DAKOTALIB])
+
+        else
+                HAVE_DAKOTA=no
+        fi
+        AC_MSG_RESULT($HAVE_DAKOTA)
+
                 
         dnl Metis directory
@@ -192 +215 @@
                         
                         AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
+                        AC_DEFINE([HAVE_MPI],[1],[with Mpi in ISSM src])
                         AC_SUBST([MPIINCL])
                         AC_SUBST([MPILIB])
@@ -310 +334 @@
                 HAVE_BLASLAPACK=yes
                 BLASLAPACKINCL=""
-                BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lmkl_lapack -lmkl -lguide"
-
-                AC_DEFINE([_HAVE_BLASLAPACK_],[1],[with Scalapack in ISSM src])
+                dnl BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lmkl_lapack -lmkl -lguide"
+                BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lfblas -lflapack"
+
+                AC_DEFINE([_HAVE_BLASLAPACK_],[1],[with blas lapack in ISSM src])
                 AC_SUBST([BLASLAPACKLIB])
                 AC_SUBST([BLASLAPACKINCL])