source: issm/oecreview/Archive/24684-25833/ISSM-25066-25067.diff

Index: ../trunk-jpl/m4/analyses.m4
===================================================================
--- ../trunk-jpl/m4/analyses.m4 (revision 25066)
+++ ../trunk-jpl/m4/analyses.m4 (revision 25067)
@@ -247,19 +247,19 @@
 AM_CONDITIONAL([GLHEIGHTADVECTION], [test x$HAVE_GLHEIGHTADVECTION = xyes])
 AC_MSG_RESULT($HAVE_GLHEIGHTADVECTION)
 dnl }}}
-dnl with-GiaIvins{{{
-AC_ARG_WITH([GiaIvins],
-       AS_HELP_STRING([--with-GiaIvins = YES], [compile with GiaIvins capabilities (default is yes)]),
-       [GIAIVINS=$withval],[GIAIVINS=yes])
-AC_MSG_CHECKING(for GiaIvins capability compilation)
+dnl with-Gia{{{
+AC_ARG_WITH([Gia],
+       AS_HELP_STRING([--with-Gia= YES], [compile with Giacapabilities (default is yes)]),
+       [GIA=$withval],[GIA=yes])
+AC_MSG_CHECKING(for Giacapability compilation)
 
-HAVE_GIAIVINS=no 
-if test "x$GIAIVINS" = "xyes"; then
-       HAVE_GIAIVINS=yes
-       AC_DEFINE([_HAVE_GIAIVINS_],[1],[with GiaIvins capability])
+HAVE_GIA=no 
+if test "x$GIA" = "xyes"; then
+       HAVE_GIA=yes
+       AC_DEFINE([_HAVE_GIA_],[1],[with Giacapability])
 fi
-AM_CONDITIONAL([GIAIVINS], [test x$HAVE_GIAIVINS = xyes])
-AC_MSG_RESULT($HAVE_GIAIVINS)
+AM_CONDITIONAL([GIA], [test x$HAVE_GIA = xyes])
+AC_MSG_RESULT($HAVE_GIA)
 dnl }}}
 dnl with-HydrologyDCEfficient{{{
 AC_ARG_WITH([HydrologyDCEfficient],
Index: ../trunk-jpl/m4/issm_options.m4
===================================================================
--- ../trunk-jpl/m4/issm_options.m4     (revision 25066)
+++ ../trunk-jpl/m4/issm_options.m4     (revision 25067)
@@ -2545,9 +2545,9 @@
                AC_MSG_ERROR([need at least MATLAB and/or Python support to compile modules! (or use --with-modules=no)]);
        fi
 
-       dnl Check that Fortran is provided if GiaIvins is on
-       if test "x${HAVE_GIAIVINS}" == "xyes" &&  test "${HAVE_FORTRAN}" == "xno"; then
-               AC_MSG_ERROR([need Fortran compiler to compile GiaIvins! (or use --without-GiaIvins )]);
+       dnl Check that Fortran is provided if Gia is on
+       if test "x${HAVE_GIA}" == "xyes" &&  test "${HAVE_FORTRAN}" == "xno"; then
+               AC_MSG_ERROR([need Fortran compiler to compile Gia! (or use --without-Gia)]);
        fi
 
        dnl Check that Fortran is provided if Love is on