[Getfem-commits] (no subject)

[Yves Renard]

branch: devel-yves-fix-matlab-pb
commit 3a7755f082d249d0678fb8a04f559f19eae44926
Author: Yves Renard <address@hidden>
Date:   Wed Sep 20 13:39:24 2017 +0200

    Change the use of mex -v for getting dynamic library extension which is not 
valid anymore
---
 configure.ac | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index 1dd5cb4..55a704a 100644
--- a/configure.ac
+++ b/configure.ac
@@ -870,13 +870,16 @@ if test "$usematlab" != NO; then
      if $(echo "" | $MEX 2>&1 | grep 'This is .*TeX'); then
          AC_MSG_ERROR([the mex binary which is in the PATH appears to be part 
of LaTeX, not matlab !! run ./configure MEX=/path/to/matlab/mex]);
      fi;
-     MATLAB_ROOT=`$MEX -v 2>&1 | grep "MATLAB  " | awk '{print $4}'|sed -e 
'2,$d'`
+     AC_CHECK_PROGS(MEXEXT, mexext)
+     # MATLAB_ROOT=`$MEX -v 2>&1 | grep "MATLAB  " | awk '{print $4}'|sed -e 
'2,$d'`
+     MATLAB_ROOT=`which $MEX | sed -e 's/bin.*$//'` 
      Matlab_INC_DIR=$MATLAB_ROOT/extern/include
      echo "checking for matlab path... " $MATLAB_ROOT
-     MATLAB_COM_EXT=`$MEX -v 2>&1 | grep "LDEXTENSION " | awk '{print $3}'`
+     MATLAB_COM_EXT=.`$MEXEXT`
      echo "checking for mex extension... " $MATLAB_COM_EXT
 #    MATLAB_RELEASE=`grep "MATLAB R" $MATLAB_ROOT/extern/src/mexversion.c | 
awk '{print $4}' | sed -e 's/R//'`
-     MATLAB_RELEASE=`grep "full_ver=" $(which $MEX) | sed 's/[[^0-9]]//g'` # 
double brackets are for escaping reasons.
+#    MATLAB_RELEASE=`grep "full_ver="$(which $MEX) | sed 's/[[^0-9]]//g'` # 
double brackets are for escaping reasons.
+     MATLAB_RELEASE=`echo $MATLAB_ROOT | sed 's/^.*R//g' | sed 's/\/$//'`
      echo "Matlab release is : R$MATLAB_RELEASE"
   fi
 fi