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

[nlopt.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 5102b8060a40f4ec06a3c929ff2be772c461d741..71d3944d86f7832f6796b7c6b48f30e33b4d3ac9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -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