Changeset 19636

Timestamp:

10/14/15 14:16:56 (9 years ago)

Author:

Eric.Larour

Message:

CHG: better fix for ISSM_DAKOTA conditional.

File:

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

issm/trunk-jpl/m4/issm_options.m4

@@ -427 +427 @@
         AC_MSG_RESULT($HAVE_DAKOTA)
         AM_CONDITIONAL([DAKOTA],[test x$HAVE_DAKOTA = xyes])
-        ISSM_DAKOTA=no
 
         dnl library and header files
@@ -460 +459 @@
                                         AC_DEFINE([DISABLE_DAKOTA_CONFIG_H],[1],[disabling DAKOTA_CONFIG_H])
                                         AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI])
-                                        ISSM_DAKOTA=yes
                                 else
                                         AC_MSG_ERROR([Dakota version not found or version ($DAKOTA_VERSION) not supported!]);
@@ -481 +479 @@
                                         AC_DEFINE([DISABLE_DAKOTA_CONFIG_H],[1],[disabling DAKOTA_CONFIG_H])
                                         AC_DEFINE([DAKOTA_HAVE_MPI],[1],[enabling parallel MPI])
-                                        ISSM_DAKOTA=yes
                                 else
                                         AC_MSG_ERROR([Dakota version not found or version ($DAKOTA_VERSION) not supported!]);
@@ -549 +546 @@
                 AC_SUBST([DAKOTALIB])
         fi
-
-        AM_CONDITIONAL([ISSM_DAKOTA],[test x$ISSM_DAKOTA = xyes])
+        AM_CONDITIONAL([ISSM_DAKOTA],[test x$DAKOTA_MAJOR = x6])
         dnl }}}
         dnl python{{{