configure.in | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 06fe563b1a9a38b9c0057e90f934435125b89605
Author: Andras Timar <ati...@suse.com>
Date: Wed Nov 23 15:09:18 2011 +0100
don't enable java extensions without java
diff --git a/configure.in b/configure.in
index eebcc78..0d1ca1b 100644
--- a/configure.in
+++ b/configure.in
@@ -7565,7 +7565,7 @@ AC_SUBST(COMMONS_LOGGING_JAR)
# scripting provider for BeanShell extension?
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])
ENABLE_SCRIPTING_BEANSHELL=YES
else
@@ -7577,7 +7577,7 @@ AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
# scripting provider for JavaScript extension?
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])
ENABLE_SCRIPTING_JAVASCRIPT=YES
else
@@ -8196,7 +8196,7 @@ dnl
===================================================================
dnl Test whether to include NLPSolver extension
dnl ===================================================================
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"
SCPDEFS="$SCPDEFS -DWITH_EXTENSION_NLPSOLVER"
AC_MSG_RESULT([yes])
_______________________________________________
Libreoffice-commits mailing list
Libreoffice-commits@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
