Changeset 11862

Timestamp:

04/02/12 16:42:58 (13 years ago)

Author:

Mathieu Morlighem

Message:

Getting rid of matlab.m4 and simplified m4

Location:

issm/trunk-jpl/m4

Files:

• issm_options.m4 (modified) (7 diffs)
• matlab.m4 (deleted)

issm/trunk-jpl/m4/issm_options.m4

@@ -88 +88 @@
         AC_MSG_RESULT(done)
         dnl }}}
-        dnl Matlab {{{1
+        dnl Matlab{{{
+
+        dnl 1. See if matlab has been provided
         AC_ARG_WITH([matlab-dir],
-                          AS_HELP_STRING([--with-matlab-dir = DIR],
-                                                         [matlab root directory. necessary for serial build.]),
-                         [MATLAB_ROOT=$withval],[MATLAB_ROOT=""]) 
-
+                                AS_HELP_STRING([--with-matlab-dir = DIR],
+                                        [matlab root directory. necessary for serial build.]),
+                                [MATLAB_ROOT=$withval],[MATLAB_ROOT=""]) 
+
+        AC_MSG_CHECKING([wether Matlab is enabled])
         if test -d "$MATLAB_ROOT"; then
-
-                dnl matlab version (matlab.m4)
-                AX_MATLAB_VERSION
-
+                HAVE_MATLAB=yes
+        else
+                HAVE_MATLAB=no
+        fi
+        if test x$HAVE_MATLAB = xyes; then
+                AC_DEFINE([_HAVE_MATLAB_],[1],[with Matlab in ISSM src])
+        fi
+        AC_MSG_RESULT($HAVE_MATLAB)
+        AM_CONDITIONAL([MATLAB], [test x$HAVE_MATLAB = xyes])
+
+        dnl 2. if matlab is provided, get version number
+        if test x$HAVE_MATLAB = xyes; then
+                AC_MSG_CHECKING([for Matlab version])
+                MATLAB_VERSION=""
+
+                dnl For Matlab R2008a and more, the version number is stored in .VERSION
+                if test -f "$MATLAB_ROOT/.VERSION" ; then
+                        MATLAB_VERSION=$(cat $MATLAB_ROOT/.VERSION)
+                fi
+                dnl Otherwise find version in file stored in bin/util/mex/version.txt
+                if test -f "$MATLAB_ROOT/bin/util/mex/version.txt" ; then
+                        MATLAB_VERSION=$(cat $MATLAB_ROOT/bin/util/mex/version.txt)
+                fi
+
+                dnl check that we found the version
+                if test -z "$MATLAB_VERSION" ; then
+                        AC_MSG_ERROR([Matlab version not found])
+                fi
+
+                case $MATLAB_VERSION in
+                        @<:@1-9@:>@.@<:@0-9@:>@ | @<:@1-9@:>@@<:@0-9@:>@.@<:@0-9@:>@ | @<:@1-9@:>@.@<:@1-9@:>@@<:@0-9@:>@)
+                                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/")
+                                ;;
+                        R2007a)
+                          MATLAB_MAJOR=7
+                          MATLAB_MINOR=4
+                          ;;
+                        R2008a)
+                          MATLAB_MAJOR=7
+                          MATLAB_MINOR=6
+                          ;;
+                        R2009a)
+                          MATLAB_MAJOR=7
+                          MATLAB_MINOR=8
+                          ;;
+                        R2010a)
+                          MATLAB_MAJOR=7
+                          MATLAB_MINOR=10
+                          ;;
+                        R2010b)
+                          MATLAB_MAJOR=7
+                          MATLAB_MINOR=11
+                          ;;
+                        R2011a)
+                          MATLAB_MAJOR=7
+                          MATLAB_MINOR=12
+                          ;;
+                        R2011b)
+                          MATLAB_MAJOR=7
+                          MATLAB_MINOR=13
+                          ;;
+                        *)
+                          AC_MSG_ERROR([can not determine Matlab version number])
+                        esac
+                AC_SUBST([MATLAB_VERSION])
+                AC_SUBST([MATLAB_MAJOR])
+                AC_SUBST([MATLAB_MINOR])
+                AC_MSG_RESULT($MATLAB_VERSION ($MATLAB_MAJOR.$MATLAB_MINOR))
+
+                dnl 3. Get Matlab libraries
                 AC_MSG_CHECKING(for Matlab headers and libraries in $MATLAB_ROOT)
-
-                dnl defaults
-                HAVE_MATLAB=yes
                 MATLABINCL=-I"$MATLAB_ROOT/extern/include";
                 
@@ -120 +187 @@
                         ;;
                         *darwin*)
-
                                 dnl mex -v gives all the flags for compilation of mex files
                                 dnl if matlab version is 7.10 or more, we must use mexmaci64 (64 bits)
@@ -131 +197 @@
                                          fi
                                 fi
-
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext`
                                 MEXEXT=".$MEXEXT"
-
-                                dnl Old MEXLINK
-                                dnl MEXLINK="-Wl,-twolevel_namespace -undefined error -arch i386 -Wl,-syslibroot,/Developer/SDKs/MacOSX10.5.sdk -mmacosx-version-min=10.5 -bundle -Wl,-exported_symbols_list,$MATLAB_ROOT/extern/lib/maci/mexFunction.map"
                         ;;
                         *cygwin*) 
@@ -148 +210 @@
                         ;;
                 esac
-
-                AC_DEFINE([_HAVE_MATLAB_],[1],[with Matlab in ISSM src])
+           AC_MSG_RESULT(done)
+
                 AC_SUBST([MATLABINCL])
                 AC_SUBST([MEX])
@@ -156 +218 @@
                 AC_SUBST([MEXLIB]) 
                 AC_SUBST([MEXLINK])
-        
-                AC_MSG_RESULT($HAVE_MATLAB)
-        else
-                HAVE_MATLAB=no
-        fi
-
-        
-        dnl should we use large arrays compilation (Matlab 7.5 and upper?)
-        if test $HAVE_MATLAB = yes; then
-                
-                dnl  if matlab version is 7.5 and more, and if platform is x86_64, then compile with largearray
-                dnl  default is no 
-                largearrays=no
-                if test $MATLAB_MAJOR -ge 7; then 
-                        if test $MATLAB_MINOR -ge 5; then 
-                                case "${host_os}" in
-                                        *linux*)
-                                                if test "${host_cpu}" = "x86_64"; then
-                                                        largearrays=yes 
-                                                fi
-                                        ;;
-                                        *cygwin*)
-                                                largearrays=yes 
-                                        ;;
-
-                                        *darwin*)
-                                                if test $MATLAB_MAJOR -ge 7; then 
-                                                        if test $MATLAB_MINOR -ge 10; then
-                                                                largearrays=yes
-                                                        fi
-                                                fi
-                                        ;;
-                                esac
-                        fi
-                fi
-        fi
-        AM_CONDITIONAL(LARGEARRAYS, test x$largearrays = xyes)
-        AM_CONDITIONAL([MATLAB], [test x$HAVE_MATLAB = xyes])
-        
+        fi
+
         dnl }}}
         dnl triangle {{{1
@@ -572 +597 @@
                         MPIINCL=-I"$MPI_INCLUDE/"
                         AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
-                        AC_DEFINE([HAVE_MPI],[1],[with Mpi in ISSM src])
                         AC_SUBST([MPIINCL])
                         AC_SUBST([MPILIB])
@@ -704 +728 @@
                                                                   
                 AC_DEFINE([_HAVE_MPI_],[1],[with Mpi in ISSM src])
-                AC_DEFINE([HAVE_MPI],[1],[with Mpi in ISSM src])
                 AC_SUBST([MPIINCL])
                 AC_SUBST([MPILIB])