Index: /issm/trunk/configs/altix64/altix64.sh
===================================================================
--- /issm/trunk/configs/altix64/altix64.sh	(revision 2213)
+++ /issm/trunk/configs/altix64/altix64.sh	(revision 2214)
@@ -1,3 +1,3 @@
 #!/bin/csh
 
-./configure --prefix=$ISSM_DIR --with-serial=no --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=/usr/include  --with-mpi-lib="-L/usr/lib -lmpi" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install_nomatlab --with-mkl-dir=/opt/intel/mkl/9.1.023/lib/64 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-plapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH
+./configure --prefix=$ISSM_DIR --with-serial=no --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=/usr/include  --with-mpi-lib="-L/usr/lib -lmpi" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-mkl-dir=/opt/intel/mkl/9.1.023/lib/64 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-plapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-graphics-lib=/usr/X11R6/lib/libX11.so
Index: /issm/trunk/etc/environment.csh
===================================================================
--- /issm/trunk/etc/environment.csh	(revision 2213)
+++ /issm/trunk/etc/environment.csh	(revision 2214)
@@ -1,11 +1,11 @@
 #ISSM_DIR and ISSM_ARCH should have been defined already in your shell settings file (.bashrc, .cshrc, etc ...)
-
 source $ISSM_DIR/etc/environment_variables.csh
 
 #Do we have any command line arguments? (such as MATLAB_DIR=otherdirthandefault), source them before exporting the variables 
 #to environment.
-foreach i ($@)
-eval $i
-end
+
+#foreach i ($@)
+#eval $i
+#end
 
 #CRON utilities
Index: /issm/trunk/externalpackages/petsc/configs/altix64/configure.sh
===================================================================
--- /issm/trunk/externalpackages/petsc/configs/altix64/configure.sh	(revision 2213)
+++ /issm/trunk/externalpackages/petsc/configs/altix64/configure.sh	(revision 2214)
@@ -4,6 +4,6 @@
 PETSC_DIR=$ISSM_DIR/externalpackages/petsc/install
 
-#./config/configure.py  --prefix=$PETSC_DIR --with-batch=1  --ISSM_ARCH=$ISSM_ARCH --PETSC_DIR=$PETSC_DIR   --with-debugging=no --with-shared=0 COPTFLAGS=-O3 FOPTFLAGS=-O3 --with-blas-lapack-dir=/opt/intel/mkl/9.1.023 --with-mpi-lib=/usr/lib/libmpi.so --with-mpi-include=/usr/include  --with-mpi-shared=0 --download-mumps=yes --download-scalapack=yes --download-blacs=yes  --with-plapack-dir=$PETSC_DIR/externalpackages/PLAPACKR32/$ISSM_ARCH --FFLAGS=-I/usr/include --with-cc=icc --with-fc=ifort
+./config/configure.py  --prefix=$PETSC_DIR --with-batch=1  --ISSM_ARCH=$ISSM_ARCH --PETSC_DIR=$PETSC_DIR   --with-debugging=no --with-shared=0 COPTFLAGS=-O3 FOPTFLAGS=-O3 --with-blas-lapack-dir=/opt/intel/mkl/9.1.023 --with-mpi-lib=/usr/lib/libmpi.so --with-mpi-include=/usr/include  --with-mpi-shared=0 --download-mumps=yes --download-scalapack=yes --download-blacs=yes  --with-plapack-dir=$PETSC_DIR/externalpackages/PLAPACKR32-hg/$ISSM_ARCH --FFLAGS=-I/usr/include --with-cc=icc --with-fc=ifort
 
 #Before Plapack implodes
-./config/configure.py  --prefix=$PETSC_DIR --with-batch=1  --ISSM_ARCH=$ISSM_ARCH --PETSC_DIR=$PETSC_DIR   --with-debugging=no --with-shared=0 COPTFLAGS=-O3 FOPTFLAGS=-O3 --with-blas-lapack-dir=/opt/intel/mkl/9.1.023 --with-mpi-lib=/usr/lib/libmpi.so --with-mpi-include=/usr/include  --with-mpi-shared=0 --download-mumps=yes --download-scalapack=yes --download-blacs=yes  --download-plapack=yes --FFLAGS=-I/usr/include --with-cc=icc --with-fc=ifort
+#./config/configure.py  --prefix=$PETSC_DIR --with-batch=1  --ISSM_ARCH=$ISSM_ARCH --PETSC_DIR=$PETSC_DIR   --with-debugging=no --with-shared=0 COPTFLAGS=-O3 FOPTFLAGS=-O3 --with-blas-lapack-dir=/opt/intel/mkl/9.1.023 --with-mpi-lib=/usr/lib/libmpi.so --with-mpi-include=/usr/include  --with-mpi-shared=0 --download-mumps=yes --download-scalapack=yes --download-blacs=yes  --download-plapack=yes --FFLAGS=-I/usr/include --with-cc=icc --with-fc=ifort
Index: /issm/trunk/externalpackages/valgrind/configs/altix64/configure.sh
===================================================================
--- /issm/trunk/externalpackages/valgrind/configs/altix64/configure.sh	(revision 2213)
+++ /issm/trunk/externalpackages/valgrind/configs/altix64/configure.sh	(revision 2214)
@@ -1,2 +1,2 @@
 #!/bin/bash
-./config/configure.py  --prefix="$ISSM_DIR/externalpackages/valgrind/install" 
+./configure   --prefix="$ISSM_DIR/externalpackages/valgrind/install" 
Index: /issm/trunk/src/c/Makefile.am
===================================================================
--- /issm/trunk/src/c/Makefile.am	(revision 2213)
+++ /issm/trunk/src/c/Makefile.am	(revision 2214)
@@ -619,5 +619,5 @@
 endif
 
-LDADD =   ./libpISSM.a $(PETSCLIB)   $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(DAKOTALIB) $(METISLIB) $(BLASLAPACKLIB)  $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB)
+LDADD =   ./libpISSM.a $(PETSCLIB)   $(FLIBS)  $(PLAPACKLIB)  $(MUMPSLIB) $(SCALAPACKLIB)  $(BLACSLIB)  $(DAKOTALIB) $(METISLIB) $(BLASLAPACKLIB)  $(MKLLIB) $(MPILIB) $(MATHLIB) $(FORTRANLIB) $(GRAPHICSLIB)
 
 diagnostic_exe_SOURCES = parallel/diagnostic.cpp
Index: /issm/trunk/src/c/toolkits/triangle/triangleincludes.h
===================================================================
--- /issm/trunk/src/c/toolkits/triangle/triangleincludes.h	(revision 2213)
+++ /issm/trunk/src/c/toolkits/triangle/triangleincludes.h	(revision 2214)
@@ -6,10 +6,12 @@
 #define _TRIANGLE_INCLUDES_H_
 
+#ifdef _SERIAL_
+
 #ifdef _C_ //only valid for iso C, not C++
-
 /*Triangle includes: */
 #include "triangle.h"
+#endif //#ifdef _C_
 
-#endif
+#endif //ifdef _SERIAL_