Changeset 1121

Timestamp:

Aug 19, 2008 2:10:29 PM (15 years ago)

Author:

gah

Message:

fix of 64bit matlab extensions

Location:

trunk

Files:

• configure.in (modified) (1 diff)
• lang/matlab/Makefile.in (modified) (1 diff)

trunk/configure.in

@@ -117 +117 @@
 if test "$with_matlab" != "no" ; then
   if test "$with_matlab" = "yes" ; then
-    AC_PATH_PROG(MEX, mex)
     AC_PATH_PROG(MATLAB, matlab)
   else
-    AC_PATH_PROG(MEX, mex, [${with_matlab}/bin/mex:${with_matlab}])
-    AC_PATH_PROG(MATLAB, matlab, [${with_matlab}/bin/mex:${with_matlab}])
-  fi
-fi
-if test "x$MATLAB" = "x" ; then
-  # No matlab, no mex. Debian 3.1 has mex script that calls mkoctfile.
-  MEX=""
-fi
+    AC_PATH_PROG(MATLAB, matlab, [${with_matlab}/bin:${with_matlab}])
+  fi
+fi
+
+if test "x$MATLAB" != "x" ; then
+  matlab_bindir=AS_DIRNAME(${MATLAB})
+  AC_PATH_PROG(MEX, mex, [${matlab_bindir}])
+  AC_PATH_PROG(MEXEXT, mexext, [${matlab_bindir}])
+  AC_MSG_CHECKING([for mex extension])
+  if test "x$MEXEXT" != "x" ; then 
+    mexext=`$MEXEXT`
+  else 
+    mexext="mexglx"
+  fi
+  AC_MSG_RESULT([$mexext])
+  MEXEXT=$mexext
+fi
+
 AC_SUBST(MEX)
 AC_SUBST(MATLAB)

trunk/lang/matlab/Makefile.in

@@ -19 +19 @@
 MEX             = @MEX@ 
 MEX_ARCH        = @MEX_ARCH@
-EXT             = .mexglx
+MEXEXT          = @MEXEXT@
+EXT             = .$(MEXEXT)
+
 matlabdir       = $$RAPPTURE_INSTALL_DIR/lib/matlab