Index: /issm/trunk/m4/matlab.m4
===================================================================
--- /issm/trunk/m4/matlab.m4	(revision 8138)
+++ /issm/trunk/m4/matlab.m4	(revision 8139)
@@ -291,10 +291,9 @@
 	    		fi
 				
-				# For Matlab R2008 and more, the version number is stored in bin/util/mex/version.txt 
-	    		ax_cv_matlab_version=`cat $MATLAB/bin/util/mex/version.txt`
-	    		if test -n "$ax_cv_matlab_version" ; then
+				# For Matlab R2008a and more, the version number is stored in .VERSION
+				ax_cv_matlab_version=`cat $MATLAB/.VERSION`
+				if test -n "$ax_cv_matlab_version" ; then
 				break
-	    		fi
-
+				fi
 		fi
     	done
@@ -308,25 +307,13 @@
 fi])
 case $ax_cv_matlab_version in
-  @<:@1-9@:>@.@<:@0-9@:>@ | @<:@1-9@:>@@<:@0-9@:>@.@<:@0-9@:>@)
-    MATLAB_VERSION=$ax_cv_matlab_version
-    MATLAB_MAJOR=`echo $MATLAB_VERSION | sed -e 's/^\(@<:@0-9@:>@*\)\.@<:@0-9@:>@*.*/\1/'`
-    MATLAB_MINOR=`echo $MATLAB_VERSION | sed -e 's/^@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/'`
-    ;;
-	R2010a)
-	MATLAB_VERSION=R2010a
-   MATLAB_MAJOR=7
-	MATLAB_MINOR=8
+	@<:@1-9@:>@.@<:@0-9@:>@ | @<:@1-9@:>@@<:@0-9@:>@.@<:@0-9@:>@)
+	MATLAB_VERSION=$ax_cv_matlab_version
+	MATLAB_MAJOR=`echo $MATLAB_VERSION | sed -e 's/^\(@<:@0-9@:>@*\)\.@<:@0-9@:>@*.*/\1/'`
+	MATLAB_MINOR=`echo $MATLAB_VERSION | sed -e 's/^@<:@0-9@:>@*\.\(@<:@0-9@:>@*\).*/\1/'`
 	;;
-	
-	R2010b)
-	MATLAB_VERSION=R2010b
-   MATLAB_MAJOR=7
-	MATLAB_MINOR=11
-	;;
-
-	R2009a)
-	MATLAB_VERSION=R2009a
+	R2007a)
+	MATLAB_VERSION=R2007a
 	MATLAB_MAJOR=7
-	MATLAB_MINOR=8
+	MATLAB_MINOR=4
 	;;
 	R2008a)
@@ -335,8 +322,18 @@
 	MATLAB_MINOR=6
 	;;
-	R2007a)
-	MATLAB_VERSION=R2007a
+	R2009a)
+	MATLAB_VERSION=R2009a
 	MATLAB_MAJOR=7
-	MATLAB_MINOR=4
+	MATLAB_MINOR=8
+	;;
+	R2010a)
+	MATLAB_VERSION=R2010a
+	MATLAB_MAJOR=7
+	MATLAB_MINOR=8
+	;;
+	R2010b)
+	MATLAB_VERSION=R2010b
+	MATLAB_MAJOR=7
+	MATLAB_MINOR=11
 	;;