Index: /issm/trunk-jpl/configs/config-altix64-castor.sh
===================================================================
--- /issm/trunk-jpl/configs/config-altix64-castor.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-altix64-castor.sh	(revision 15308)
@@ -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 --with-mkl-dir=/opt/intel/mkl/9.1.023/lib/64 --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-graphics-lib=/usr/X11R6/lib/libX11.so
+./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-libflags="-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-lib="-L$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH --with-graphics-lib=/usr/X11R6/lib/libX11.so
Index: /issm/trunk-jpl/configs/config-arm-linux-matlab.sh
===================================================================
--- /issm/trunk-jpl/configs/config-arm-linux-matlab.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-arm-linux-matlab.sh	(revision 15308)
@@ -10,5 +10,5 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
 	--with-math-lib="/usr/lib/libm.dylib" \
Index: /issm/trunk-jpl/configs/config-cosmos.sh
===================================================================
--- /issm/trunk-jpl/configs/config-cosmos.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-cosmos.sh	(revision 15308)
@@ -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=/opt/mpich/gm/intel10.1/include  --with-mpi-lib="-L/opt/mpich/gm/intel10.1/lib -lmpich -L/usr/local/gm/lib/ -lgm  -lpthread  -lrt" --with-petsc-arch=$ISSM_ARCH --with-mkl-dir=/opt/intel/mkl/10.0.5.025/lib/32/  --with-plapack-dir="-L$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH  --with-vendor=intel-linux --with-graphics-lib=/usr/X11R6/lib/libX11.so
+./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=/opt/mpich/gm/intel10.1/include  --with-mpi-libflags="-L/opt/mpich/gm/intel10.1/lib -lmpich -L/usr/local/gm/lib/ -lgm  -lpthread  -lrt" --with-petsc-arch=$ISSM_ARCH --with-mkl-dir=/opt/intel/mkl/10.0.5.025/lib/32/  --with-plapack-dir="-L$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH/ --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/$ISSM_ARCH  --with-vendor=intel-linux --with-graphics-lib=/usr/X11R6/lib/libX11.so
Index: /issm/trunk-jpl/configs/config-discover.sh
===================================================================
--- /issm/trunk-jpl/configs/config-discover.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-discover.sh	(revision 15308)
@@ -13,5 +13,5 @@
  --with-mkl-dir="/usr/local/intel/mkl/10.1.2.024/lib/64/" \
  --with-mpi-include="/usr/local/intel/mpi/4.0.3.008/include64/" \
- --with-mpi-lib="-L/usr/local/intel/mpi/4.0.3.008/lib64/ -lmpi -lmpiif" \
+ --with-mpi-libflags="-L/usr/local/intel/mpi/4.0.3.008/lib64/ -lmpi -lmpiif" \
  --with-petsc-arch=$ISSM_ARCH \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-greenplanet.sh
===================================================================
--- /issm/trunk-jpl/configs/config-greenplanet.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-greenplanet.sh	(revision 15308)
@@ -12,5 +12,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include="/sopt/mpi/openmpi-1.5.4_psm/intel/include/" \
- --with-mpi-lib="-L/sopt/mpi/openmpi-1.5.4_psm/intel/lib/ -lmpi -lmpi_f77" \
+ --with-mpi-libflags="-L/sopt/mpi/openmpi-1.5.4_psm/intel/lib/ -lmpi -lmpi_f77" \
  --with-petsc-arch=$ISSM_ARCH \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-hoffman2.sh
===================================================================
--- /issm/trunk-jpl/configs/config-hoffman2.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-hoffman2.sh	(revision 15308)
@@ -7,5 +7,5 @@
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
  --with-mpi-include=/u/local/intel/11.1/openmpi/1.4.5/include \
- --with-mpi-lib="-L/u/local/intel/11.1/openmpi/1.4.5/include -lmpi" \
+ --with-mpi-libflags="-L/u/local/intel/11.1/openmpi/1.4.5/include -lmpi" \
  --with-petsc-arch=$ISSM_ARCH \
  --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
Index: /issm/trunk-jpl/configs/config-linux64-astrid-gia.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-astrid-gia.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-astrid-gia.sh	(revision 15308)
@@ -16,5 +16,5 @@
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
Index: /issm/trunk-jpl/configs/config-linux64-astrid-mpich1.0.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-astrid-mpich1.0.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-astrid-mpich1.0.sh	(revision 15308)
@@ -13,5 +13,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich " \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-linux64-astrid-petsc2.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-astrid-petsc2.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-astrid-petsc2.sh	(revision 15308)
@@ -5,3 +5,3 @@
 #mpich 1.0.2
 
-./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-scotch-dir=$ISSM_DIR/externalpackages/scotch/install --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install --enable-debugging --with-shapelib-dir=$ISSM_DIR/externalpackages/shapelib/install\
+./configure --prefix=$ISSM_DIR --with-matlab-dir=$MATLAB_DIR --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install --with-metis-dir=$ISSM_DIR/externalpackages/metis/install --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" --with-petsc-arch=$ISSM_ARCH --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/fblaslapack/$ISSM_ARCH --with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH -lPLAPACK" --with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/externalpackages/PLAPACKR32-hg/$ISSM_ARCH/INCLUDE" --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/blacs-dev/$ISSM_ARCH --with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/SCALAPACK/$ISSM_ARCH --with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/externalpackages/MUMPS_4.6.3/$ISSM_ARCH --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" --with-graphics-lib=/usr/lib64/libX11.so --with-cxxoptflags="-march=opteron -O2" --with-numthreads=32 --with-scotch-dir=$ISSM_DIR/externalpackages/scotch/install --with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install --enable-debugging --with-shapelib-dir=$ISSM_DIR/externalpackages/shapelib/install\
Index: /issm/trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-astrid-petsc3.3.sh	(revision 15308)
@@ -13,5 +13,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
Index: /issm/trunk-jpl/configs/config-linux64-astrid-petscdev.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-astrid-petscdev.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-astrid-petscdev.sh	(revision 15308)
@@ -11,5 +11,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-linux64-astrid.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-astrid.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-astrid.sh	(revision 15308)
@@ -16,5 +16,5 @@
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
Index: /issm/trunk-jpl/configs/config-linux64-cloud.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-cloud.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-cloud.sh	(revision 15308)
@@ -13,5 +13,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
Index: /issm/trunk-jpl/configs/config-linux64-larsen-gia.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-larsen-gia.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-larsen-gia.sh	(revision 15308)
@@ -16,5 +16,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
Index: /issm/trunk-jpl/configs/config-linux64-larsen-petsc3.2.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-larsen-petsc3.2.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-larsen-petsc3.2.sh	(revision 15308)
@@ -16,5 +16,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
Index: /issm/trunk-jpl/configs/config-linux64-larsen.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-larsen.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-larsen.sh	(revision 15308)
@@ -17,5 +17,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich/install/lib/ -lmpich -lmpl " \
  --with-petsc-arch=$ISSM_ARCH \
  --with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
Index: /issm/trunk-jpl/configs/config-linux64-murdo-nopetsc.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-murdo-nopetsc.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-murdo-nopetsc.sh	(revision 15308)
@@ -4,5 +4,5 @@
  --prefix=$ISSM_DIR \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
  --with-matlab-dir=$MATLAB_DIR \
  --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
Index: /issm/trunk-jpl/configs/config-linux64-murdo.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-murdo.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-murdo.sh	(revision 15308)
@@ -10,5 +10,5 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
+	--with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-python-dir=$ISSM_DIR/externalpackages/python/install\
Index: /issm/trunk-jpl/configs/config-linux64-ubuntu64.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-ubuntu64.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-linux64-ubuntu64.sh	(revision 15308)
@@ -8,5 +8,5 @@
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
  --with-mpi-include="/usr/lib/mpich2/include" \
- --with-mpi-lib="-L/usr/lib/mpich2/lib -lmpich -lmpl -ldl" \
+ --with-mpi-libflags="-L/usr/lib/mpich2/lib -lmpich -lmpl -ldl" \
  --with-petsc-arch=$ISSM_ARCH \
  --with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
Index: /issm/trunk-jpl/configs/config-macosx-snowleopard-bothapis.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx-snowleopard-bothapis.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx-snowleopard-bothapis.sh	(revision 15308)
@@ -12,5 +12,5 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \
 	--with-math-lib="/usr/lib/libm.dylib" \
Index: /issm/trunk-jpl/configs/config-macosx-snowleopard-python.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx-snowleopard-python.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx-snowleopard-python.sh	(revision 15308)
@@ -11,5 +11,5 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \
 	--with-math-lib="/usr/lib/libm.dylib" \
Index: /issm/trunk-jpl/configs/config-macosx32-mathieu.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx32-mathieu.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx32-mathieu.sh	(revision 15308)
@@ -16,5 +16,5 @@
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-petsc-arch=$ISSM_ARCH \
 	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-macosx32-ogive.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx32-ogive.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx32-ogive.sh	(revision 15308)
@@ -11,5 +11,5 @@
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-petsc-arch=$ISSM_ARCH \
 	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-macosx64-basile.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-basile.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-basile.sh	(revision 15308)
@@ -11,5 +11,5 @@
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-mpi-include="$ISSM_DIR/externalpackages/mpich2/install/include"  \
-	--with-mpi-lib="$ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags="$ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-petsc-arch=$ISSM_ARCH \
 	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-macosx64-chris-bothapis.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-chris-bothapis.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-chris-bothapis.sh	(revision 15308)
@@ -12,5 +12,5 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
 	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
Index: /issm/trunk-jpl/configs/config-macosx64-chris-python.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-chris-python.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-chris-python.sh	(revision 15308)
@@ -11,5 +11,5 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
 	--with-fortran-lib="/usr/local/gfortran/lib/gcc/x86_64-apple-darwin10/4.6.2/libgfortran.a" \
Index: /issm/trunk-jpl/configs/config-macosx64-chris.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-chris.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-chris.sh	(revision 15308)
@@ -11,5 +11,5 @@
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-petsc-arch=$ISSM_ARCH \
 	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-macosx64-larour-gia.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-larour-gia.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-larour-gia.sh	(revision 15308)
@@ -14,5 +14,5 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
 	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
Index: /issm/trunk-jpl/configs/config-macosx64-larour.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-larour.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-larour.sh	(revision 15308)
@@ -14,5 +14,5 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
 	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
Index: /issm/trunk-jpl/configs/config-macosx64-lion-helene.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-lion-helene.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-lion-helene.sh	(revision 15308)
@@ -12,5 +12,5 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-chaco-dir=$ISSM_DIR/externalpackages/chaco/install \
 	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
Index: /issm/trunk-jpl/configs/config-macosx64-mathieu.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-mathieu.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-mathieu.sh	(revision 15308)
@@ -11,5 +11,5 @@
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-petsc-arch=$ISSM_ARCH \
 	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-macosx64-mlion-mathieu.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-mlion-mathieu.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-mlion-mathieu.sh	(revision 15308)
@@ -12,5 +12,5 @@
 	--with-python-numpy-dir="$ISSM_DIR/externalpackages/python/install/lib/python2.7/site-packages/numpy/core/include/numpy" \
 	--with-mpi-include="$ISSM_DIR/externalpackages/mpich2/install/include"  \
-	--with-mpi-lib="$ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags="$ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
 	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
@@ -28,3 +28,3 @@
 	--enable-debugging
 
-	#--with-mpi-lib="-L/$ISSM_DIR/externalpackages/mpich2/install/lib/ -lpmpich -lmpich -lmpl " \
+	#--with-mpi-libflags="-L/$ISSM_DIR/externalpackages/mpich2/install/lib/ -lpmpich -lmpich -lmpl " \
Index: /issm/trunk-jpl/configs/config-macosx64-nicole.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-nicole.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-nicole.sh	(revision 15308)
@@ -12,5 +12,5 @@
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-petsc-arch=$ISSM_ARCH \
 	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-macosx64-ogive.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-ogive.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-ogive.sh	(revision 15308)
@@ -15,5 +15,5 @@
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-petsc-arch=$ISSM_ARCH \
 	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-macosx64-simple.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-simple.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-simple.sh	(revision 15308)
@@ -10,5 +10,5 @@
 	--with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
 	--with-math-lib="/usr/lib/libm.dylib" \
Index: /issm/trunk-jpl/configs/config-macosx64-sophie.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64-sophie.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64-sophie.sh	(revision 15308)
@@ -15,5 +15,5 @@
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-petsc-arch=$ISSM_ARCH \
 	--with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-macosx64.sh
===================================================================
--- /issm/trunk-jpl/configs/config-macosx64.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-macosx64.sh	(revision 15308)
@@ -13,5 +13,5 @@
 	--with-metis-dir="$ISSM_DIR/externalpackages/metis/install" \
 	--with-mpi-include="$ISSM_DIR/externalpackages/mpich2/install/include" \
-	--with-mpi-lib=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
+	--with-mpi-libflags=" $ISSM_DIR/externalpackages/mpich2/install/lib/libpmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpich.a $ISSM_DIR/externalpackages/mpich2/install/lib/libmpl.a " \
 	--with-chaco-dir="$ISSM_DIR/externalpackages/chaco/install" \
 	--with-fortran-lib="/usr/local/gfortran/lib/libgfortran.a" \
Index: /issm/trunk-jpl/configs/config-pleiades-petsc2.sh
===================================================================
--- /issm/trunk-jpl/configs/config-pleiades-petsc2.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-pleiades-petsc2.sh	(revision 15308)
@@ -8,5 +8,5 @@
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
  --with-mpi-include=/nasa/sgi/mpt/1.25/include \
- --with-mpi-lib="-L/nasa/sgi/mpt/1.25/lib/ -lmpi -lpthread -lgfortran" \
+ --with-mpi-libflags="-L/nasa/sgi/mpt/1.25/lib/ -lmpi -lpthread -lgfortran" \
  --with-petsc-arch=$ISSM_ARCH \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-pleiades-petsc3.2.sh
===================================================================
--- /issm/trunk-jpl/configs/config-pleiades-petsc3.2.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-pleiades-petsc3.2.sh	(revision 15308)
@@ -10,5 +10,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include=/nasa/sgi/mpt/1.25/include \
- --with-mpi-lib="-L/nasa/sgi/mpt/1.25/lib/ -lmpi -lpthread -lgfortran -lirc" \
+ --with-mpi-libflags="-L/nasa/sgi/mpt/1.25/lib/ -lmpi -lpthread -lgfortran -lirc" \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
  --with-mkl-dir=/nasa/intel/mkl/10.0.011/lib/64/ \
Index: /issm/trunk-jpl/configs/config-pleiades-petsc3.3.sh
===================================================================
--- /issm/trunk-jpl/configs/config-pleiades-petsc3.3.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-pleiades-petsc3.3.sh	(revision 15308)
@@ -9,5 +9,5 @@
  --with-tao-dir="$ISSM_DIR/externalpackages/tao/install" \
  --with-mpi-include="/nasa/sgi/mpt/2.06rp16/include" \
- --with-mpi-lib="-L/nasa/sgi/mpt/2.06rp16/ -lmpi" \
+ --with-mpi-libflags="-L/nasa/sgi/mpt/2.06rp16/ -lmpi" \
  --with-mkl-dir="/nasa/intel/mkl/10.0.011" \
  --with-petsc-arch=$ISSM_ARCH \
Index: /issm/trunk-jpl/configs/config-pleiades-petscdev.sh
===================================================================
--- /issm/trunk-jpl/configs/config-pleiades-petscdev.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-pleiades-petscdev.sh	(revision 15308)
@@ -9,5 +9,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include=/nasa/sgi/mpt/2.04/include \
- --with-mpi-lib="-L/nasa/sgi/mpt/2.04/lib/ -lmpi -lpthread -lgfortran" \
+ --with-mpi-libflags="-L/nasa/sgi/mpt/2.04/lib/ -lmpi -lpthread -lgfortran" \
  --with-petsc-arch=$ISSM_ARCH \
  --with-dakota-dir=$ISSM_DIR/externalpackages/dakota/install \
Index: /issm/trunk-jpl/configs/config-walgreen.sh
===================================================================
--- /issm/trunk-jpl/configs/config-walgreen.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-walgreen.sh	(revision 15308)
@@ -8,5 +8,5 @@
  --with-tao-dir=$ISSM_DIR/externalpackages/tao/install \
  --with-mpi-include=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
+ --with-mpi-libflags="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich -lmpl " \
  --with-mkl-dir="/opt/intel/mkl/10.0.1.014/lib/64/lib/" \
  --with-mumps-dir="$ISSM_DIR/externalpackages/petsc/install/" \
Index: /issm/trunk-jpl/configs/config-win7-32.sh
===================================================================
--- /issm/trunk-jpl/configs/config-win7-32.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-win7-32.sh	(revision 15308)
@@ -11,5 +11,5 @@
 	--with-petsc-dir="$ISSM_DIR/externalpackages/petsc/install" \
 	--with-petsc-arch=$ISSM_ARCH  \
-	--with-mpi-lib-dir="$ISSM_DIR/externalpackages/petsc/install/lib" \
-   --with-mpi-libs="-Wl,libpetsc.lib" \
+	--with-mpi-libflags-dir="$ISSM_DIR/externalpackages/petsc/install/lib" \
+   --with-mpi-libflagss="-Wl,libpetsc.lib" \
 	--with-mpi-include-dir="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni" 
Index: /issm/trunk-jpl/configs/config-win7-64-parallel.sh
===================================================================
--- /issm/trunk-jpl/configs/config-win7-64-parallel.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-win7-64-parallel.sh	(revision 15308)
@@ -14,4 +14,4 @@
 	--with-blas-lapack-dir="$ISSM_DIR/externalpackages/petsc/install/lib"  \
 	--with-mpi-include="C:/MPICH2/include" \
-	--with-mpi-lib="-LC:/MPICH2/lib mpi.lib"
+	--with-mpi-libflags="-LC:/MPICH2/lib mpi.lib"
 
Index: /issm/trunk-jpl/configs/config-win7-64.sh
===================================================================
--- /issm/trunk-jpl/configs/config-win7-64.sh	(revision 15307)
+++ /issm/trunk-jpl/configs/config-win7-64.sh	(revision 15308)
@@ -11,5 +11,5 @@
 	--with-petsc-arch=$ISSM_ARCH  \
 	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install/lib/  \
-	--with-mpi-lib-dir="$ISSM_DIR/externalpackages/petsc/install/lib" \
-   --with-mpi-libs="-Wl,libpetsc.lib" \
+	--with-mpi-libflags-dir="$ISSM_DIR/externalpackages/petsc/install/lib" \
+   --with-mpi-libflagss="-Wl,libpetsc.lib" \
 	--with-mpi-include-dir="$ISSM_DIR/externalpackages/petsc/install/include/mpiuni" 
Index: /issm/trunk-jpl/externalpackages/matlab/install.sh
===================================================================
--- /issm/trunk-jpl/externalpackages/matlab/install.sh	(revision 15307)
+++ /issm/trunk-jpl/externalpackages/matlab/install.sh	(revision 15308)
@@ -1,35 +1,3 @@
 #!/bin/bash
-set -eu
-
-if [ ! -h install ];
-then
-	echo "  ****************************************************************"
-	echo "  *                                                              *"
-	echo "  * you need create a symbolic link from matlab's root directory *"
-	echo "  *                                                              *"
-	echo "  * First, you need to locate matlab's root directory            *"
-	echo "  * The easiest way to find it is to launch matlab and run the   *"
-	echo "  * following command: matlabroot                                *"
-	echo "  * Then, create a symbolic link using the command 'ln -s ' the  *"
-	echo "  * target directory should be named 'install'                   *"
-	echo "  *                                                              *"
-	echo "  * Examples:                                                    *"
-	echo "  *    ln -s /usr/local/matlab712/ install                       *"
-	echo "  *    ln -s /Applications/MATLAB_R2012a.app/ install            *"
-	echo "  *                                                              *"
-	echo "  * run ./install.sh again to check that the link is correct     *"
-	echo "  *                                                              *"
-	echo "  ****************************************************************"
-else
-
-	#Read link
-	DIR=$(readlink install)
-	if [ -d $DIR ]
-	then
-		echo "Symbolic link correctly set"
-	else
-		rm -rf install
-		echo "Incorrect symbolic link:"
-		echo "provided target ($DIR) does not exist or is not a directory"
-	fi
-fi
+rm -rf install
+ln -s /usr/local/matlab80/ install
Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 15307)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 15308)
@@ -541,9 +541,5 @@
 	dnl }}}
 	dnl mpi{{{
-   dnl Old MPI options
 	AC_MSG_CHECKING(for mpi)
-	AC_ARG_WITH([mpi-lib],
-		AS_HELP_STRING([--with-mpi-lib = options],[mpi options, for ex: "-L$MPIROOT -lmpich]),
-		[MPILIB=$withval],[MPILIB=""])
 	
 	AC_ARG_WITH([mpi-include],
@@ -551,39 +547,38 @@
 	  [MPI_INCLUDE=$withval],[MPI_INCLUDE=""])
 
-   dnl New MPI options
-	AC_ARG_WITH([mpi-include-dir],
-	  AS_HELP_STRING([--with-mpi-include-dir=DIR],[mpi include directory, necessary for parallel build]),
-	  [MPI_INCLUDE=$withval],[MPI_INCLUDE=""])
-
-	AC_ARG_WITH([mpi-lib-dir],
-	  AS_HELP_STRING([--with-mpi-lib-dir=DIR],[mpi lib directory, necessary for parallel build]),
-	  [MPILIB_DIR=$withval],[MPILIB_DIR=""])
-
-	AC_ARG_WITH([mpi-libs],
-	  AS_HELP_STRING([--with-mpi-libs=LIBS],[mpi libraries to be used, necessary for parallel build]),
-	  [MPILIB=$withval],[MPILIB=""])
-
-	
-	if test -z "$MPILIB" ; then
+	AC_ARG_WITH([mpi-libdir],
+	  AS_HELP_STRING([--with-mpi-libdir=DIR],[mpi lib directory, necessary for parallel build]),
+	  [MPI_LIBDIR=$withval],[MPI_LIBDIR=""])
+
+	AC_ARG_WITH([mpi-libflags],
+	  AS_HELP_STRING([--with-mpi-libflags=LIBS],[mpi libraries to be used, necessary for parallel build]),
+	  [MPI_LIBFLAGS=$withval],[MPI_LIBFLAGS=""])
+
+	
+	if test -z "$MPI_INCLUDE" ; then
 		HAVE_MPI=no
 	else
-		if test -z "$MPI_INCLUDE" ; then
-			HAVE_MPI=no
+		HAVE_MPI=yes
+
+		dnl Processing for windows
+		if  test x$VENDOR = xintel-win32; then
+			MPI_LIBDIR=`cygpath -m $MPILIB_DIR`
+			MPIINCL=-L`cygpath -m $MPIINCL`
+		elif test x$VENDOR = xintel-win64; then
+			MPILIB_DIR=-L`cygpath -m $MPILIB_DIR`
+			MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
+		fi
+
+		if test -z "$MPI_LIBDIR"; then
+			MPIINCL=-I"$MPI_INCLUDE"
+			MPILIB="$MPI_LIBFLAGS"
 		else
-			HAVE_MPI=yes
-		   if  test $VENDOR = intel-win32; then
-            MPILIB_DIR=`cygpath -m $MPILIB_DIR`
-            MPIINCL=-L`cygpath -m $MPIINCL`
-         elif test $VENDOR = intel-win64; then
-            MPILIB_DIR=-L`cygpath -m $MPILIB_DIR`
-            MPI_INCLUDE=`cygpath -m $MPI_INCLUDE`
-         fi
 			MPIINCL=-I"$MPI_INCLUDE"
-         MPILIB="$MPILIB_DIR $MPILIB"
-			AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
-			AC_DEFINE([HAVE_MPI],[1],[Mpi Flag for Dakota (DO NOT REMOVE)])
-			AC_SUBST([MPIINCL])
-			AC_SUBST([MPILIB])
-		fi
+			MPILIB="-L$MPILIB_DIR $MPI_LIBFLAGS"
+		fi
+		AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
+		AC_DEFINE([HAVE_MPI],[1],[Mpi Flag for Dakota (DO NOT REMOVE)])
+		AC_SUBST([MPIINCL])
+		AC_SUBST([MPILIB])
 	fi