Changeset 15262

Timestamp:

06/13/13 16:14:16 (12 years ago)

Author:

Mathieu Morlighem

Message:

BUG: fix mex compilation on linux (was using cygwin settings)

File:

• issm/trunk-jpl/m4/issm_options.m4 (modified) (2 diffs)

issm/trunk-jpl/m4/issm_options.m4

@@ -122 +122 @@
       dnl OS-dependent variables and checks
                 case "${host_os}" in
-                        *linux*)
-         ;&
-                        *darwin*)
-                      MEXLINK=$(mex -v 2>&1 < /dev/null | grep LDFLAGS     | sed -e "s/         LDFLAGS            = //g")
-                 MEXLIB=$( mex -v 2>&1 < /dev/null | grep CXXLIBS     | sed -e "s/         CXXLIBS            = //g")
-                      MEXEXT=$( mex -v 2>&1 < /dev/null | grep LDEXTENSION | sed -e "s/         LDEXTENSION        = //g")
-                        ;;
                         *cygwin*) 
                                 if  test $VENDOR = intel-win7-32; then
@@ -137 +130 @@
                                 MEXEXT=`$MATLAB_ROOT/bin/mexext.bat`
                                 MEXEXT=".$MEXEXT"
+                        ;;
+                   *)
+                      MEXLINK=$(mex -v 2>&1 < /dev/null | grep LDFLAGS     | sed -e "s/         LDFLAGS            = //g")
+                 MEXLIB=$( mex -v 2>&1 < /dev/null | grep CXXLIBS     | sed -e "s/         CXXLIBS            = //g")
+                      MEXEXT=$( mex -v 2>&1 < /dev/null | grep LDEXTENSION | sed -e "s/         LDEXTENSION        = //g")
                         ;;
       esac