configure.ac | 20 ++++++++++---------- instsetoo_native/Package_rdb.mk | 4 ++-- scripting/Module_scripting.mk | 4 ++-- sd/Library_sd.mk | 20 ++++++++++---------- sd/Library_sdui.mk | 4 ++-- 5 files changed, 26 insertions(+), 26 deletions(-)
New commits: commit d5d721a130df631f1cf46ac636ba22314f539f6b Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Aug 30 12:54:37 2013 -0500 ENABLE_SCRIPTING_* Harmonize ENABLE_* variable to TRUE/<nothing> Change-Id: I937967889da75062c792cf377ce4e13c67526162 Reviewed-on: https://gerrit.libreoffice.org/5702 Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com> Tested-by: Norbert Thiebaud <nthieb...@gmail.com> diff --git a/configure.ac b/configure.ac index c22e296..be7ddd7 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 44c7bdd..308bb46 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 c08b9cf..4829c53 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 \ ) \ commit f0b94ad3e74afca55016ee1e15b0848ede51a016 Author: Norbert Thiebaud <nthieb...@gmail.com> Date: Fri Aug 30 11:35:02 2013 -0500 ENABLE_BLUETOOTH* Harmonize ENABLE_* variable to TRUE/<nothing> Change-Id: Ia27882faa9c85c439bc1f77987d766f65f1d8cef Reviewed-on: https://gerrit.libreoffice.org/5699 Reviewed-by: Norbert Thiebaud <nthieb...@gmail.com> Tested-by: Norbert Thiebaud <nthieb...@gmail.com> diff --git a/configure.ac b/configure.ac index 997cc82..c22e296 100644 --- a/configure.ac +++ b/configure.ac @@ -9887,7 +9887,7 @@ AC_SUBST(ENABLE_PACKAGEKIT) AC_MSG_CHECKING([whether to enable Impress remote control]) if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then AC_MSG_RESULT([yes]) - ENABLE_SDREMOTE=YES + ENABLE_SDREMOTE=TRUE AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) # If not explicitly enabled or disabled, default @@ -9909,7 +9909,7 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then if test "$OS" = "LINUX"; then if test "$ENABLE_DBUS" = "TRUE"; then AC_MSG_RESULT([yes]) - ENABLE_SDREMOTE_BLUETOOTH=YES + ENABLE_SDREMOTE_BLUETOOTH=TRUE dnl =================================================================== dnl Check for system bluez dnl =================================================================== @@ -9924,18 +9924,18 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then fi else AC_MSG_RESULT([no, dbus disabled]) - ENABLE_SDREMOTE_BLUETOOTH=NO + ENABLE_SDREMOTE_BLUETOOTH= fi else AC_MSG_RESULT([yes]) - ENABLE_SDREMOTE_BLUETOOTH=YES + ENABLE_SDREMOTE_BLUETOOTH=TRUE fi else AC_MSG_RESULT([no]) - ENABLE_SDREMOTE_BLUETOOTH=NO + ENABLE_SDREMOTE_BLUETOOTH= fi else - ENABLE_SDREMOTE=NO + ENABLE_SDREMOTE= AC_MSG_RESULT([no]) fi AC_SUBST(ENABLE_SDREMOTE) diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk index e791d03..955253b 100644 --- a/sd/Library_sd.mk +++ b/sd/Library_sd.mk @@ -533,7 +533,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/view/zoomlist \ )) -ifeq ($(ENABLE_SDREMOTE),YES) +ifeq ($(ENABLE_SDREMOTE),TRUE) $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/BufferedStreamSocket \ sd/source/ui/remotecontrol/Communicator \ @@ -550,13 +550,13 @@ $(eval $(call gb_Library_add_objcxxobjects,sd,\ sd/source/ui/remotecontrol/OSXNetworkService \ )) -else +else # OS!=MACSOX ifeq ($(ENABLE_AVAHI),TRUE) $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/AvahiNetworkService \ )) -endif +endif # ENABLE_AVAHI=TRUE $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/DiscoveryService \ @@ -577,15 +577,15 @@ $(eval $(call gb_Library_add_cobjects,sd,\ sd/source/ui/remotecontrol/mDNSResponder/dllmain \ )) -endif +endif # OS=WNT -endif +endif # OS!=MACOSX $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE \ )) -ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) +ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),TRUE) ifneq ($(OS),MACOSX) @@ -593,7 +593,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ )) -else +else # OS!=MACOSX $(eval $(call gb_Library_add_objcxxobjects,sd,\ sd/source/ui/remotecontrol/BluetoothServer \ @@ -609,14 +609,14 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,sd,\ IOBluetooth \ )) -endif +endif # OS!=MACOSX $(eval $(call gb_Library_add_defs,sd,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) -endif +endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE -endif +endif # ENABLE_SDREMOTE=TRUE # vim: set noet sw=4 ts=4: diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk index 53f279d..8eb3145 100644 --- a/sd/Library_sdui.mk +++ b/sd/Library_sdui.mk @@ -15,12 +15,12 @@ $(eval $(call gb_Library_set_include,sdui,\ -I$(SRCDIR)/sd/source/ui/inc \ )) -ifeq ($(ENABLE_SDREMOTE),YES) +ifeq ($(ENABLE_SDREMOTE),TRUE) $(eval $(call gb_Library_add_defs,sdui,\ -DENABLE_SDREMOTE \ )) -ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) +ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),TRUE) $(eval $(call gb_Library_add_defs,sdui,\ -DENABLE_SDREMOTE_BLUETOOTH \ )) _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits