Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 12623)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 12624)
@@ -60,4 +60,9 @@
 			export CFLAGS=" -D_INTEL_LINUX_"
 			export CXXFLAGS=" -D_INTEL_LINUX_"
+		elif test $VENDOR = intel-discover; then
+			export CC=icc
+			export CXX=icpc
+			export CXXFLAGS=" -O3 -D_INTEL_LINUX_ "
+			export CFLAGS=" -O3 -D_INTEL_LINUX_ "
 		elif test $VENDOR = intel-pleiades; then
 			export CC=icc
@@ -751,5 +756,9 @@
 		dnl defaults
 		HAVE_SCALAPACK=yes
-		SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lscalapack"
+		if test $VENDOR = intel-discover; then
+		 SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lmkl_scalapack_lp64"
+		else
+		 SCALAPACKLIB=-L"$SCALAPACK_ROOT/ -lscalapack"
+		fi
 
 		AC_DEFINE([_HAVE_SCALAPACK_],[1],[with Scalapack in ISSM src])
@@ -771,5 +780,8 @@
 		HAVE_BLASLAPACK=yes
 		BLASLAPACKINCL=""
-		
+	
+		if test $VENDOR = intel-discover; then
+		 BLASLAPACKLIB=-L"$BLASLAPACK_ROOT -lmkl_lapack -lmkl -lguide -lpthread"
+		else
 		dnl: branch on whether we are running on windows or linux.
 		case "${host_os}" in
@@ -784,4 +796,5 @@
 			;;
 		esac
+		fi
 
 		AC_DEFINE([_HAVE_BLASLAPACK_],[1],[with blas lapack in ISSM src])
@@ -881,5 +894,9 @@
 		HAVE_BLACS=yes
 		BLACSINCL=""
-		BLACSLIB=-L"$BLACS_ROOT/ -lblacs"
+		if test $VENDOR = intel-discover; then
+		 BLACSLIB=-L"$BLACS_ROOT/ -lmkl_blacs_intelmpi_lp64"
+		else
+		 BLACSLIB=-L"$BLACS_ROOT/ -lblacs"
+		fi
         
 		AC_DEFINE([_HAVE_BLACS_],[1],[with Blacs in ISSM src])