diff options
| author | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 12:54:37 -0500 |
|---|---|---|
| committer | Norbert Thiebaud <nthiebaud@gmail.com> | 2013-08-30 19:59:02 +0000 |
| commit | d5d721a130df631f1cf46ac636ba22314f539f6b (patch) | |
| tree | 9a988af44fd2cbfe90be3d531471215b2ae28a34 | |
| parent | f0b94ad3e74afca55016ee1e15b0848ede51a016 (diff) | |
ENABLE_SCRIPTING_* Harmonize ENABLE_* variable to TRUE/<nothing>
Change-Id: I937967889da75062c792cf377ce4e13c67526162
Reviewed-on: https://gerrit.libreoffice.org/5702
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
| -rw-r--r-- | configure.ac | 8 | ||||
| -rw-r--r-- | instsetoo_native/Package_rdb.mk | 4 | ||||
| -rw-r--r-- | scripting/Module_scripting.mk | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index c22e29699b6c..be7ddd7f2b00 100644 --- a/configure.ac +++ b/configure.ac @@ -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) diff --git a/instsetoo_native/Package_rdb.mk b/instsetoo_native/Package_rdb.mk index 44c7bddc9b7a..308bb460c801 100644 --- a/instsetoo_native/Package_rdb.mk +++ b/instsetoo_native/Package_rdb.mk @@ -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) \ ) \ ) \ )) diff --git a/scripting/Module_scripting.mk b/scripting/Module_scripting.mk index c08b9cfc8b42..4829c53623cb 100644 --- a/scripting/Module_scripting.mk +++ b/scripting/Module_scripting.mk @@ -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 \ ) \ |