Kaydet (Commit) 06fe563b authored tarafından Andras Timar's avatar Andras Timar

don't enable java extensions without java

üst 7264d276
...@@ -7565,7 +7565,7 @@ AC_SUBST(COMMONS_LOGGING_JAR) ...@@ -7565,7 +7565,7 @@ AC_SUBST(COMMONS_LOGGING_JAR)
# scripting provider for BeanShell extension? # scripting provider for BeanShell extension?
AC_MSG_CHECKING([whether to build extension for support of scripts in BeanShell]) AC_MSG_CHECKING([whether to build extension for support of scripts in BeanShell])
if test "x$enable_ext_scripting_beanshell" = "xyes" -a "x$enable_extension_integration" != "xno"; then if test "x$enable_ext_scripting_beanshell" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_BEANSHELL=YES ENABLE_SCRIPTING_BEANSHELL=YES
else else
...@@ -7577,7 +7577,7 @@ AC_SUBST(ENABLE_SCRIPTING_BEANSHELL) ...@@ -7577,7 +7577,7 @@ AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
# scripting provider for JavaScript extension? # scripting provider for JavaScript extension?
AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript]) AC_MSG_CHECKING([whether to build extension for support of scripts in JavaScript])
if test "x$enable_ext_scripting_javascript" = "xyes" -a "x$enable_extension_integration" != "xno"; then if test "x$enable_ext_scripting_javascript" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_JAVASCRIPT=YES ENABLE_SCRIPTING_JAVASCRIPT=YES
else else
...@@ -8196,7 +8196,7 @@ dnl =================================================================== ...@@ -8196,7 +8196,7 @@ dnl ===================================================================
dnl Test whether to include NLPSolver extension dnl Test whether to include NLPSolver extension
dnl =================================================================== dnl ===================================================================
AC_MSG_CHECKING([for NLPSolver extension integration]) AC_MSG_CHECKING([for NLPSolver extension integration])
if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" != "xno"; then if test "x$enable_ext_nlpsolver" = "xyes" -a "x$enable_extension_integration" != "xno" -a "x$with_java" != "no"; then
BUILD_TYPE="$BUILD_TYPE NLPSOLVER" BUILD_TYPE="$BUILD_TYPE NLPSOLVER"
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER" SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment