Changeset 26384

Timestamp:

08/10/21 07:02:18 (4 years ago)

Author:

Mathieu Morlighem

Message:

CHG adding SHP conditional compilation

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -940 +940 @@
         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 +1763 @@
                 AC_SUBST([SHAPELIBINCL])
                 AC_SUBST([SHAPELIBLIB])
+                AM_CONDITIONAL([SHP], [test "x${HAVE_SHAPELIB}" == "xyes"])
         fi
         dnl }}}