Kaydet (Commit) d5d721a1 authored tarafından Norbert Thiebaud's avatar Norbert Thiebaud

ENABLE_SCRIPTING_* Harmonize ENABLE_* variable to TRUE/<nothing>

Change-Id: I937967889da75062c792cf377ce4e13c67526162
Reviewed-on: https://gerrit.libreoffice.org/5702Reviewed-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
Tested-by: 's avatarNorbert Thiebaud <nthiebaud@gmail.com>
üst f0b94ad3
......@@ -10589,7 +10589,7 @@ AC_SUBST(COMMONS_LOGGING_JAR)
AC_MSG_CHECKING([whether to build support for scripts in BeanShell])
if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_BEANSHELL=YES
ENABLE_SCRIPTING_BEANSHELL=TRUE
dnl ===================================================================
dnl Check for system beanshell
......@@ -10610,7 +10610,7 @@ if test "${enable_scripting_beanshell}" != "no" -a "x$with_java" != "xno"; then
fi
else
AC_MSG_RESULT([no])
ENABLE_SCRIPTING_BEANSHELL=NO
ENABLE_SCRIPTING_BEANSHELL=
SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_BEANSHELL"
fi
AC_SUBST(ENABLE_SCRIPTING_BEANSHELL)
......@@ -10621,7 +10621,7 @@ AC_SUBST(BSH_JAR)
AC_MSG_CHECKING([whether to build support for scripts in JavaScript])
if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then
AC_MSG_RESULT([yes])
ENABLE_SCRIPTING_JAVASCRIPT=YES
ENABLE_SCRIPTING_JAVASCRIPT=TRUE
dnl ===================================================================
dnl Check for system rhino
......@@ -10642,7 +10642,7 @@ if test "${enable_scripting_javascript}" != "no" -a "x$with_java" != "xno"; then
fi
else
AC_MSG_RESULT([no])
ENABLE_SCRIPTING_JAVASCRIPT=NO
ENABLE_SCRIPTING_JAVASCRIPT=
SCPDEFS="$SCPDEFS -DWITHOUT_SCRIPTING_JAVASCRIPT"
fi
AC_SUBST(ENABLE_SCRIPTING_JAVASCRIPT)
......
......@@ -16,8 +16,8 @@ $(eval $(call gb_Package_add_files,instsetoo_native_rdb,$(gb_PROGRAMDIRNAME)/ser
$(call gb_Helper_optional,POSTGRESQL,$(if $(filter YES,$(BUILD_POSTGRESQL_SDBC)),xml/postgresql-sdbc.rdb)) \
$(if $(filter TRUE,$(DISABLE_SCRIPTING)),,\
$(if $(ENABLE_JAVA),\
$(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),xml/scriptproviderforbeanshell.rdb) \
$(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),xml/scriptproviderforjavascript.rdb) \
$(if $(ENABLE_SCRIPTING_BEANSHELL),xml/scriptproviderforbeanshell.rdb) \
$(if $(ENABLE_SCRIPTING_JAVASCRIPT),xml/scriptproviderforjavascript.rdb) \
) \
) \
))
......
......@@ -17,12 +17,12 @@ $(eval $(call gb_Module_add_targets,scripting,\
Jar_Highlight \
Jar_MemoryUsage \
Jar_ScriptFramework \
$(if $(filter $(ENABLE_SCRIPTING_BEANSHELL),YES),\
$(if $(ENABLE_SCRIPTING_BEANSHELL),\
Jar_ScriptProviderForBeanShell \
Rdb_scriptproviderforbeanshell \
) \
Jar_ScriptProviderForJava \
$(if $(filter $(ENABLE_SCRIPTING_JAVASCRIPT),YES),\
$(if $(ENABLE_SCRIPTING_JAVASCRIPT),\
Jar_ScriptProviderForJavaScript \
Rdb_scriptproviderforjavascript \
) \
......
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