Index: /issm/trunk/m4/issm_options.m4
===================================================================
--- /issm/trunk/m4/issm_options.m4	(revision 8273)
+++ /issm/trunk/m4/issm_options.m4	(revision 8274)
@@ -128,5 +128,5 @@
 			  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,5 +158,5 @@
 			  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,5 +180,5 @@
 			  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,5 +202,5 @@
 			  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,5 +262,5 @@
 	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,4 +382,26 @@
 		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,5 +659,5 @@
 	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,5 +677,5 @@
 	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,5 +694,5 @@
 	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,5 +714,5 @@
 			  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,5 +742,5 @@
 			  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,5 +781,5 @@
 			  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)