Index: /issm/trunk-jpl/m4/issm_options.m4
===================================================================
--- /issm/trunk-jpl/m4/issm_options.m4	(revision 15239)
+++ /issm/trunk-jpl/m4/issm_options.m4	(revision 15240)
@@ -230,47 +230,27 @@
 
 		case $DAKOTA_VERSION in
-			*.*.*) 
-				AC_MSG_CHECKING(for dakota major version)
-				DAKOTA_MAJOR=`echo $DAKOTA_VERSION | sed 's%\([0-9]*\).*%\1%' `
-				AC_MSG_RESULT($DAKOTA_MAJOR)
-				AC_DEFINE_UNQUOTED([_DAKOTA_MAJOR_],$DAKOTA_MAJOR,[Dakota major version number])
-				AC_MSG_CHECKING(for dakota minor version)
-				DAKOTA_MINOR=`echo $DAKOTA_VERSION | sed 's%[0-9]*\.\([0-9]*\).*%\1%' `
-				AC_MSG_RESULT($DAKOTA_MINOR)
-				AC_DEFINE_UNQUOTED([_DAKOTA_MINOR_],$DAKOTA_MINOR,[Dakota minor version number])
-				AC_MSG_CHECKING(for dakota patch version)
-				DAKOTA_PATCH=`echo $DAKOTA_VERSION | sed 's%[0-9]*\.[0-9]*\.\([0-9]*\).*%\1%' `
-				AC_MSG_RESULT($DAKOTA_PATCH)
-				AC_DEFINE_UNQUOTED([_DAKOTA_PATCH_],$DAKOTA_PATCH,[Dakota patch version number])
+			@<:@1-9@:>@.@<:@0-9@:>@.@<:@0-9@:>@)
+				DAKOTA_MAJOR=`echo $DAKOTA_VERSION | sed -e 's/^\(@<:@0-9@:>@*\)\..*/\1/'`
+				DAKOTA_MINOR=`echo $DAKOTA_VERSION | sed -e 's/^@<:@0-9@:>@*\.\(@<:@0-9@:>@*\)\..*/\1/'`
+				DAKOTA_PATCH=`echo $DAKOTA_VERSION | sed -e 's/^@<:@0-9@:>@*\.@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/'`
 			;;
-			*.*)
-				AC_MSG_CHECKING(for dakota major version)
-				DAKOTA_MAJOR=`echo $DAKOTA_VERSION | sed 's%\([0-9]*\).*%\1%' `
-				AC_MSG_RESULT($DAKOTA_MAJOR)
-				AC_DEFINE_UNQUOTED([_DAKOTA_MAJOR_],$DAKOTA_MAJOR,[Dakota major version number])
-				AC_MSG_CHECKING(for dakota minor version)
-				DAKOTA_MINOR=`echo $DAKOTA_VERSION | sed 's%[0-9]*\.\([0-9]*\).*%\1%' `
-				AC_MSG_RESULT($DAKOTA_MINOR)
-				AC_DEFINE_UNQUOTED([_DAKOTA_MINOR_],$DAKOTA_MINOR,[Dakota minor version number])
-				AC_MSG_CHECKING(for dakota patch version)
+			@<:@1-9@:>@.@<:@0-9@:>@)
+				DAKOTA_MAJOR=`echo $DAKOTA_VERSION | sed -e 's/^\(@<:@0-9@:>@*\)\..*/\1/'`
+				DAKOTA_MINOR=`echo $DAKOTA_VERSION | sed -e 's/^@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/'`
 				DAKOTA_PATCH=0
-				AC_MSG_RESULT($DAKOTA_PATCH)
-				AC_DEFINE_UNQUOTED([_DAKOTA_PATCH_],$DAKOTA_PATCH,[Dakota patch version number])
 			;;
-			*) 
-				AC_MSG_CHECKING(for dakota major version)
-				DAKOTA_MAJOR=`echo $DAKOTA_VERSION | sed 's%\([0-9]*\).*%\1%' `
-				AC_MSG_RESULT($DAKOTA_MAJOR)
-				AC_DEFINE_UNQUOTED([_DAKOTA_MAJOR_],$DAKOTA_MAJOR,[Dakota major version number])
-				AC_MSG_CHECKING(for dakota minor version)
-				DAKOTA_MINOR=0
-				AC_MSG_RESULT($DAKOTA_MINOR)
-				AC_DEFINE_UNQUOTED([_DAKOTA_MINOR_],$DAKOTA_MINOR,[Dakota minor version number])
-				AC_MSG_CHECKING(for dakota patch version)
-				DAKOTA_PATCH=0
-				AC_MSG_RESULT($DAKOTA_PATCH)
-				AC_DEFINE_UNQUOTED([_DAKOTA_PATCH_],$DAKOTA_PATCH,[Dakota patch version number])
-			;;
+			*)
+				AC_MSG_ERROR([Dakota version ($DAKOTA_VERSION) not supported!]);
+		   ;;
 		esac
+		AC_MSG_CHECKING(for dakota major version)
+		AC_MSG_RESULT($DAKOTA_MAJOR)
+		AC_DEFINE_UNQUOTED([_DAKOTA_MAJOR_],$DAKOTA_MAJOR,[Dakota major version number])
+		AC_MSG_CHECKING(for dakota minor version)
+		AC_MSG_RESULT($DAKOTA_MINOR)
+		AC_DEFINE_UNQUOTED([_DAKOTA_MINOR_],$DAKOTA_MINOR,[Dakota minor version number])
+		AC_MSG_CHECKING(for dakota patch version)
+		AC_MSG_RESULT($DAKOTA_PATCH)
+		AC_DEFINE_UNQUOTED([_DAKOTA_PATCH_],$DAKOTA_PATCH,[Dakota patch version number])
 
 		AC_SUBST([DAKOTAINCL])
@@ -1163,5 +1143,5 @@
 				fi
 			 fi
-				AC_MSG_ERROR([frtran library provided ($FORTRAN_LIB$) does not exist!]);
+				AC_MSG_ERROR([fortran library provided ($FORTRAN_LIB) does not exist!]);
 			fi
 		fi