Changeset 8139

Timestamp:

05/05/11 08:13:18 (14 years ago)

Author:

Mathieu Morlighem

Message:

find matlab version in /Users/morlighe/Desktop/Glaciology/svn/issm/trunk/externalpackages/matlab/install/.VERSION for R2008a and more (no need to export MATLAB_VERSION variable

File:

• issm/trunk/m4/matlab.m4 (modified) (3 diffs)

issm/trunk/m4/matlab.m4

@@ -291 +291 @@
                         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 +307 @@
 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 +322 @@
         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
         ;;