Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 26383)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 26384)
@@ -940,5 +940,5 @@
 	if test "x${HAVE_ESMF}" == "xyes"; then
 		ESMFINCL="-I${ESMF_ROOT}/include"
-		ESMFLIB="-L${ESMF_ROOT}/lib -lesmf"
+		ESMFLIB="-L${ESMF_ROOT}/lib/libO/Linux.gfortran.64.mpich.default/ -lesmf"
 		AC_DEFINE([_HAVE_ESMF_], [1], [with ESMF in ISSM src])
 		AC_SUBST([ESMFINCL])
@@ -1763,4 +1763,5 @@
 		AC_SUBST([SHAPELIBINCL])
 		AC_SUBST([SHAPELIBLIB])
+		AM_CONDITIONAL([SHP], [test "x${HAVE_SHAPELIB}" == "xyes"])
 	fi
 	dnl }}}