Changeset 11065

Timestamp:

12/29/11 11:02:41 (13 years ago)

Author:

Eric.Larour

Message:

Improved capability: m4 macro to detect new version files in R2011b of Matlab

File:

• issm/trunk-jpl/m4/matlab.m4 (modified) (1 diff)

issm/trunk-jpl/m4/matlab.m4

@@ -291 +291 @@
                                 
                                 # For Matlab R2008a and more, the version number is stored in .VERSION
-                                ax_cv_matlab_version=`cat $MATLAB/.VERSION`
+                                if test -f "$MATLAB/.VERSION" ; then
+                                        ax_cv_matlab_version=`cat $MATLAB/.VERSION`
+                                        if test -n "$ax_cv_matlab_version" ; then
+                                        break
+                                        fi
+                                fi
+
+                                #Last  hope, find version in file 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
                                 break