Changeset 8274

Timestamp:

05/13/11 14:18:28 (14 years ago)

Author:

Mathieu Morlighem

Message:

Homogenized and added tao

File:

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

issm/trunk/m4/issm_options.m4 ¶

@@ -128 +128 @@
                           AS_HELP_STRING([--with-triangle-dir = DIR], [triangle root directory. necessary for serial build]),
                          [TRIANGLE_ROOT=$withval],[TRIANGLE_ROOT=""]) 
-        AC_MSG_CHECKING(for Triangle headers and libraries )
+        AC_MSG_CHECKING(for Triangle headers and libraries)
 
         if test -d "$TRIANGLE_ROOT"; then
@@ -158 +158 @@
                           AS_HELP_STRING([--with-dakota-dir = DIR], [dakota root directory. necessary for serial build]),
                          [DAKOTA_ROOT=$withval],[DAKOTA_ROOT=""]) 
-        AC_MSG_CHECKING(for Dakota )
+        AC_MSG_CHECKING(for Dakota)
         
         if test -d "$DAKOTA_ROOT"; then
@@ -180 +180 @@
                           AS_HELP_STRING([--with-chaco-dir = DIR], [chaco root directory.]),
                          [CHACO_ROOT=$withval],[CHACO_ROOT=""]) 
-        AC_MSG_CHECKING(for Chaco )
+        AC_MSG_CHECKING(for Chaco)
         
         if test -d "$CHACO_ROOT"; then
@@ -202 +202 @@
                           AS_HELP_STRING([--with-scotch-dir = DIR], [scotch root directory.]),
                          [SCOTCH_ROOT=$withval],[SCOTCH_ROOT=""]) 
-        AC_MSG_CHECKING(for Scotch )
+        AC_MSG_CHECKING(for Scotch)
         
         if test -d "$SCOTCH_ROOT"; then
@@ -262 +262 @@
         dnl }}}
         dnl mpi{{{1
-        AC_MSG_CHECKING(for mpi...)
+        AC_MSG_CHECKING(for mpi)
         AC_ARG_WITH([mpi-lib],
                           AS_HELP_STRING([--with-mpi-lib = otions],
@@ -382 +382 @@
                 AC_MSG_RESULT($HAVE_PETSC)
         fi
+        dnl }}}
+        dnl tao{{{1
+        AC_ARG_WITH([tao-dir],
+                                AS_HELP_STRING([--with-tao-dir = DIR], [tao root directory.]),
+                                [TAO_ROOT=$withval],[TAO_ROOT=""]) 
+          AC_MSG_CHECKING(for Tao)
+
+          if test -d "$TAO_ROOT"; then
+
+                dnl defaults
+                  HAVE_TAO=yes
+                  TAOINCL=-I$TAO_ROOT/include
+                  TAOLIB="-L$TAO_ROOT/lib "
+
+                  AC_DEFINE([_HAVE_TAO_],[1],[with Tao in ISSM src])
+                  AC_SUBST([TAOINCL])
+                  AC_SUBST([TAOLIB])
+
+          else
+                HAVE_TAO=no
+                fi
+                AC_MSG_RESULT($HAVE_TAO)
         dnl }}}
         dnl mpiuni{{{1
@@ -637 +659 @@
         dnl }}}
         dnl math{{{1
-        AC_MSG_CHECKING(for math library...)
+        AC_MSG_CHECKING(for math library)
         AC_ARG_WITH([math-lib],
                           AS_HELP_STRING([--with-math-lib = otions],
@@ -655 +677 @@
         dnl fortran{{{1
         dnl fortran library  option
-        AC_MSG_CHECKING(for fortran library...)
+        AC_MSG_CHECKING(for fortran library)
         AC_ARG_WITH([fortran-lib],
                           AS_HELP_STRING([--with-fortran-lib = options],
@@ -672 +694 @@
         dnl }}}
         dnl graphics{{{1
-        AC_MSG_CHECKING(for graphics library...)
+        AC_MSG_CHECKING(for graphics library)
         AC_ARG_WITH([graphics-lib],
                           AS_HELP_STRING([--with-graphics-lib = options],
@@ -692 +714 @@
                           AS_HELP_STRING([--with-vendor = VENDOR], [vendor name, ex: intel]),
                          [VENDOR=$withval],[VENDOR=""]) 
-        AC_MSG_CHECKING(for vendor compilers )
+        AC_MSG_CHECKING(for vendor compilers)
         if test -n "$VENDOR"; then
 
@@ -720 +742 @@
                           AS_HELP_STRING([--with-cxxoptflags = CXXOPTFLAGS], [optimization using CXX flags, ex: --with-cxxoptflags=-march=opteron -O3]),
                          [CXXOPTFLAGS=$withval],[CXXOPTFLAGS="-g -O2"]) 
-        AC_MSG_CHECKING(for C++ optimization flags )
+        AC_MSG_CHECKING(for C++ optimization flags)
         AC_SUBST([CXXOPTFLAGS])
         AC_MSG_RESULT(done)
@@ -759 +781 @@
                           AS_HELP_STRING([--with-64bit-indices = bool], [use 64 bit integers, default 0, ex: --with-64bit-indices=1]),
                          [USE_64BIT_INDICES=$withval],[USE_64BIT_INDICES=0]) 
-        AC_MSG_CHECKING(for 64 bit indices )
+        AC_MSG_CHECKING(for 64 bit indices)