Index: /issm/trunk-jpl/configs/config-linux64-ad.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-ad.sh	(revision 13255)
+++ /issm/trunk-jpl/configs/config-linux64-ad.sh	(revision 13256)
@@ -18,3 +18,3 @@
 	--without-groundingline \
 	--without-kriging  \
-	--with-adolc-dir=$ADOLC_DIR 
+	--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install
Index: /issm/trunk-jpl/configs/config-linux64-astrid-ad.sh
===================================================================
--- /issm/trunk-jpl/configs/config-linux64-astrid-ad.sh	(revision 13255)
+++ /issm/trunk-jpl/configs/config-linux64-astrid-ad.sh	(revision 13256)
@@ -2,35 +2,9 @@
 
 ./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=$ISSM_DIR/externalpackages/mpich2/install/include  \
- --with-mpi-lib="-L$ISSM_DIR/externalpackages/mpich2/install/lib/ -lmpich" \
- --with-petsc-arch=$ISSM_ARCH \
- --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/externalpackages/PLAPACKR32-hg/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/ \
- --with-graphics-lib=/usr/lib64/libX11.so \
- --with-cxxoptflags="-march=opteron -O2" \
- --with-fortran-lib="-L/usr/lib/gcc/x86_64-redhat-linux/4.1.1/ -lgfortran" \
- --with-rose-dir=$ISSM_DIR/externalpackages/rose/install/ \
- --with-adic2-dir=$ISSM_DIR/externalpackages/adic/install/ \
- --with-numthreads=24 \
- --without-thermal \
- --without-control \
- --without-hydrology \
- --without-diagnostic \
- --without-balanced \
- --without-responses \
- --without-slope \
- --without-rifts \
- --without-steadystate \
- --without-transient \
- --without-3d \
- --without-groundingline
- 
-#--without-prognostic \
+	--prefix=$ISSM_DIR \
+	--without-kriging  \
+	--without-kml  \
+	--with-gsl-dir=$ISSM_DIR/externalpackages/gsl/install \
+	--with-adolc-dir=$ISSM_DIR/externalpackages/adolc/install \
+	--with-matlab-dir=$MATLAB_DIR \
+	--with-triangle-dir=$ISSM_DIR/externalpackages/triangle/install \
Index: /issm/trunk-jpl/src/modules/matlab/Makefile.am
===================================================================
--- /issm/trunk-jpl/src/modules/matlab/Makefile.am	(revision 13255)
+++ /issm/trunk-jpl/src/modules/matlab/Makefile.am	(revision 13256)
@@ -89,5 +89,8 @@
 deps +=
 else
-deps += ../../c/libISSMModules.a ../../c/libISSMCore.a
+deps += ../../c/libISSMModules.a ../../c/libISSMCore.a  
+if ADOLC
+deps += $(ADOLCLIB)
+endif
 endif