Index: /issm/trunk-jpl/jenkins/macosx_pine-island
===================================================================
--- /issm/trunk-jpl/jenkins/macosx_pine-island	(revision 24461)
+++ /issm/trunk-jpl/jenkins/macosx_pine-island	(revision 24462)
@@ -13,4 +13,5 @@
 	--with-mpi-include=$ISSM_DIR/externalpackages/mpich/install/include \
 	--with-mpi-libflags="-L${ISSM_DIR}/externalpackages/mpich/install/lib -lmpi -lmpicxx -lmpifort" \
+	--with-blas-lapack-dir=$ISSM_DIR/externalpackages/lapack/install \
 	--with-metis-dir=$ISSM_DIR/externalpackages/petsc/install \
 	--with-scalapack-dir=$ISSM_DIR/externalpackages/petsc/install \
@@ -41,5 +42,6 @@
 	cmake		install.sh
 	mpich		install-3.3.sh
-	petsc		install-3.7-mac.sh
+	lapack		install-3.8-mac.sh
+	petsc		install-3.7-linux.sh
 	triangle	install-macosx64.sh
 	chaco		install.sh
Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 24461)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 24462)
@@ -523,5 +523,4 @@
 				if test x$DAKOTA_VERSION = x5.1 || test x$DAKOTA_VERSION = x5.2; then
 					DAKOTALIB="-L$DAKOTA_ROOT/lib -ldakota -lteuchos -lpecos -llhs -lsparsegrid -lsurfpack -lconmin -lddace -lfsudace -ljega -lcport -loptpp -lpsuade -lncsuopt -lcolin -linterfaces -lmomh -lscolib -lpebbl -ltinyxml -lutilib -l3po -lhopspack -lnidr -lamplsolver -lboost_signals -lboost_regex -lboost_filesystem -lboost_system"
-					dnl DAKOTALIB+= "-lgslcblas -L/usr/lib -lblas -llapack"
 				else if test x$DAKOTA_VERSION = x5.3 || test x$DAKOTA_VERSION = x5.3.1; then
 					DAKOTAFLAGS="-DDISABLE_DAKOTA_CONFIG_H -DBOOST_MULTI_INDEX_DISABLE_SERIALIZATION -DDAKOTA_PLUGIN -DBOOST_DISABLE_ASSERTS -DDAKOTA_HAVE_BOOST_FS -DHAVE_UNISTD_H -DHAVE_SYSTEM -DHAVE_WORKING_FORK -DHAVE_WORKING_VFORK -DHAVE_SYS_WAIT_H -DHAVE_USLEEP -DDAKOTA_F90 -DDAKOTA_HAVE_MPI -DHAVE_PECOS -DHAVE_SURFPACK -DDAKOTA_COLINY -DDAKOTA_UTILIB -DHAVE_ADAPTIVE_SAMPLING -DHAVE_CONMIN -DDAKOTA_DDACE -DHAVE_FSUDACE -DDAKOTA_HOPS -DHAVE_JEGA -DHAVE_NCSU -DHAVE_NL2SOL -DHAVE_OPTPP -DDAKOTA_OPTPP -DHAVE_PSUADE -DHAVE_AMPL"
@@ -1498,5 +1497,5 @@
 		*linux*)
 			BLASLAPACKLIB="-L${BLASLAPACK_ROOT}/lib"
-			if ls ${BLASLAPACK_ROOT}/lib/libflapack.* 1> /dev/null 2>&1; then
+			if ls ${BLASLAPACKLIB}/libflapack.* 1> /dev/null 2>&1; then
 				BLASLAPACKLIB+=" -lflapack -lfblas"
 			else
@@ -1506,5 +1505,5 @@
 		*darwin*)
 			BLASLAPACKLIB="-L${BLASLAPACK_ROOT}/lib"
-			if test -f "${BLASLAPACKLIB}/libflapack.*"; then
+			if ls ${BLASLAPACKLIB}/libflapack.* 1> /dev/null 2>&1; then
 				BLASLAPACKLIB+=" -lflapack -lfblas"
 			else