Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 19635)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 19636)
@@ -427,5 +427,4 @@
 	AC_MSG_RESULT($HAVE_DAKOTA)
 	AM_CONDITIONAL([DAKOTA],[test x$HAVE_DAKOTA = xyes])
-	ISSM_DAKOTA=no
 
 	dnl library and header files
@@ -460,5 +459,4 @@
 					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,5 +479,4 @@
 					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,6 +546,5 @@
 		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{{{