Index: ../trunk-jpl/configs/config-macosx64-larour.sh
===================================================================
--- ../trunk-jpl/configs/config-macosx64-larour.sh	(revision 13653)
+++ ../trunk-jpl/configs/config-macosx64-larour.sh	(revision 13654)
@@ -18,9 +18,8 @@
 	--with-numthreads=8 \
 	--with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install  \
 	--with-petsc-arch=$ISSM_ARCH \
+	--with-cxxoptflags="-L/usr/lib -lbundle1.o"\
 	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/petsc/install \
-	--with-plapack-lib="-L$ISSM_DIR/externalpackages/petsc/install/ -lPLAPACK" \
-	--with-plapack-include="-I$ISSM_DIR/externalpackages/petsc/install/include/ " \
 	--with-blacs-dir=$ISSM_DIR/externalpackages/petsc/install/ \
 	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install/ \
 	--with-mumps-dir=$ISSM_DIR/externalpackages/petsc/install/ \
Index: ../trunk-jpl/configs/config-pleiades-petsc2.sh
===================================================================
--- ../trunk-jpl/configs/config-pleiades-petsc2.sh	(revision 13653)
+++ ../trunk-jpl/configs/config-pleiades-petsc2.sh	(revision 13654)
@@ -2,7 +2,7 @@
 
 ./configure \
  --prefix=$ISSM_DIR \
- --with-modules=no \
+ --with-wrappers=no \
  --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
  --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
Index: ../trunk-jpl/configs/config-linux64-ad.sh
===================================================================
--- ../trunk-jpl/configs/config-linux64-ad.sh	(revision 13653)
+++ ../trunk-jpl/configs/config-linux64-ad.sh	(revision 13654)
@@ -2,7 +2,7 @@
 
 ./configure \
 	--prefix=$ISSM_DIR \
-	--without-modules\
+	--without-wrappers\
 	--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install\
 	--without-thermal \
 	--without-control \
Index: ../trunk-jpl/configs/config-pleiades-petscdev.sh
===================================================================
--- ../trunk-jpl/configs/config-pleiades-petscdev.sh	(revision 13653)
+++ ../trunk-jpl/configs/config-pleiades-petscdev.sh	(revision 13654)
@@ -2,7 +2,7 @@
 
 ./configure \
  --prefix=$ISSM_DIR \
- --with-modules=no \
+ --with-wrappers=no \
  --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
  --with-metis-dir=$ISSM_DIR/externalpackages/petsc/src/externalpackages/metis-5.0.2-p3 \
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
Index: ../trunk-jpl/configs/config-greenplanet.sh
===================================================================
--- ../trunk-jpl/configs/config-greenplanet.sh	(revision 13653)
+++ ../trunk-jpl/configs/config-greenplanet.sh	(revision 13654)
@@ -5,7 +5,7 @@
 
 ./configure \
  --prefix=$ISSM_DIR \
- --with-modules=no \
+ --with-wrappers=no \
  --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
  --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
Index: ../trunk-jpl/configs/config-arm-linux.sh
===================================================================
--- ../trunk-jpl/configs/config-arm-linux.sh	(revision 13653)
+++ ../trunk-jpl/configs/config-arm-linux.sh	(revision 13654)
@@ -6,7 +6,7 @@
     --host="arm-linux-androideabi" \
     --enable-shared \
     --without-fortran \
-	--without-modules \
+	--without-wrappers \
 	--without-kriging \
 	--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
 	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
Index: ../trunk-jpl/configs/config-macosx64-ad.sh
===================================================================
--- ../trunk-jpl/configs/config-macosx64-ad.sh	(revision 13653)
+++ ../trunk-jpl/configs/config-macosx64-ad.sh	(revision 13654)
@@ -2,7 +2,7 @@
 
 ./configure \
 	--prefix=$ISSM_DIR \
-	--without-modules\
+	--without-wrappers\
 	--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install\
 	--without-thermal \
 	--without-control \
Index: ../trunk-jpl/configs/config-pleiades.sh
===================================================================
--- ../trunk-jpl/configs/config-pleiades.sh	(revision 13653)
+++ ../trunk-jpl/configs/config-pleiades.sh	(revision 13654)
@@ -2,7 +2,7 @@
 
 ./configure \
  --prefix=$ISSM_DIR \
- --with-modules=no \
+ --with-wrappers=no \
  --with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
  --with-metis-dir=$ISSM_DIR/externalpackages/metis/install \
  --with-petsc-dir=$ISSM_DIR/externalpackages/petsc/install \
Index: ../trunk-jpl/configs/config-macosx64-gsl.sh
===================================================================
--- ../trunk-jpl/configs/config-macosx64-gsl.sh	(revision 13653)
+++ ../trunk-jpl/configs/config-macosx64-gsl.sh	(revision 13654)
@@ -2,7 +2,7 @@
 
 ./configure \
 	--prefix=$ISSM_DIR \
-	--without-modules\
+	--without-wrappers\
 	--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install
 	#--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install 
     #--without-fortran-lib