diff options
| -rw-r--r-- | configure.ac | 12 | ||||
| -rw-r--r-- | sd/Library_sd.mk | 20 | ||||
| -rw-r--r-- | sd/Library_sdui.mk | 4 |
3 files changed, 18 insertions, 18 deletions
diff --git a/configure.ac b/configure.ac index 997cc82df06a..c22e29699b6c 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 e791d03488e6..955253b298c7 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 53f279d1b850..8eb3145aedd7 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 \ )) |