提交 3dfca4f2 编写于 作者: S stevenj

just unconditionally disable compilation of matlab & octave plugins unless...

just unconditionally disable compilation of matlab & octave plugins unless --enable-shared is turned on, since test was unreliable and the 32-bit systems where static libraries worked are disappearing anyway

Ignore-this: 27823a53f73a6c56ad7c0312c950b518

darcs-hash:20120720180419-c8de0-c22087237d77b38bcbfe44bd7780c11fec9fb549.gz
上级 b71abf6b
......@@ -259,22 +259,8 @@ fi
if test x"$OCT_INSTALL_DIR" != "x"; then
if test "$enable_shared" = no; then
AC_MSG_CHECKING([whether mkoctfile can link with static objects])
rm -f conftest*
echo 'void foo(void) {};' > conftestfoo.c
$CC -c conftestfoo.c >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
cat > conftest.cc <<EOF
#include <octave/oct.h>
extern "C" void foo(void);
DEFUN_DLD(foobar, args, nargout, "foo bar") { foo(); }
EOF
if $MKOCTFILE conftest.cc conftestfoo.o >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_MSG_WARN([mkoctfile requires --enable-shared; won't compile Octave plugin])
OCT_INSTALL_DIR=""
fi
fi
fi
......@@ -318,26 +304,12 @@ EOF
if test x"$MATLAB" != xecho; then
if test "$enable_shared" = no; then
AC_MSG_CHECKING([whether mex can link with static objects])
rm -f conftest*
echo 'void foo(void) {};' > conftestfoo.c
$CC -c conftestfoo.c >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD
cat > conftest.c <<EOF
#include <mex.h>
extern void foo(void);
void mexFunction(int nlhs, mxArray *plhs[[]],
int nrhs, const mxArray *prhs[[]]) { foo(); }
EOF
if $MEX conftest.c conftestfoo.o >&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
AC_MSG_RESULT(yes)
else
AC_MSG_RESULT(no)
AC_MSG_WARN([mex requires --enable-shared; won't compile Matlab plugin])
MEX_INSTALL_DIR=""
MATLAB=echo
fi
fi
fi
if test x"$MATLAB" != xecho; then
# try to find installation directory
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册