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

Change-Id: Ia27882faa9c85c439bc1f77987d766f65f1d8cef
Reviewed-on: https://gerrit.libreoffice.org/5699
Reviewed-by: Norbert Thiebaud <nthiebaud@gmail.com>
Tested-by: Norbert Thiebaud <nthiebaud@gmail.com>
This commit is contained in:
Norbert Thiebaud
2013-08-30 11:35:02 -05:00
parent 87b3670557
commit f0b94ad3e7
3 changed files with 18 additions and 18 deletions

View File

@@ -9887,7 +9887,7 @@ AC_SUBST(ENABLE_PACKAGEKIT)
AC_MSG_CHECKING([whether to enable Impress remote control]) AC_MSG_CHECKING([whether to enable Impress remote control])
if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_SDREMOTE=YES ENABLE_SDREMOTE=TRUE
AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control]) AC_MSG_CHECKING([whether to enable Bluetooth support in Impress remote control])
# If not explicitly enabled or disabled, default # 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 "$OS" = "LINUX"; then
if test "$ENABLE_DBUS" = "TRUE"; then if test "$ENABLE_DBUS" = "TRUE"; then
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_SDREMOTE_BLUETOOTH=YES ENABLE_SDREMOTE_BLUETOOTH=TRUE
dnl =================================================================== dnl ===================================================================
dnl Check for system bluez dnl Check for system bluez
dnl =================================================================== dnl ===================================================================
@@ -9924,18 +9924,18 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
fi fi
else else
AC_MSG_RESULT([no, dbus disabled]) AC_MSG_RESULT([no, dbus disabled])
ENABLE_SDREMOTE_BLUETOOTH=NO ENABLE_SDREMOTE_BLUETOOTH=
fi fi
else else
AC_MSG_RESULT([yes]) AC_MSG_RESULT([yes])
ENABLE_SDREMOTE_BLUETOOTH=YES ENABLE_SDREMOTE_BLUETOOTH=TRUE
fi fi
else else
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
ENABLE_SDREMOTE_BLUETOOTH=NO ENABLE_SDREMOTE_BLUETOOTH=
fi fi
else else
ENABLE_SDREMOTE=NO ENABLE_SDREMOTE=
AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
fi fi
AC_SUBST(ENABLE_SDREMOTE) AC_SUBST(ENABLE_SDREMOTE)

View File

@@ -533,7 +533,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/view/zoomlist \ sd/source/ui/view/zoomlist \
)) ))
ifeq ($(ENABLE_SDREMOTE),YES) ifeq ($(ENABLE_SDREMOTE),TRUE)
$(eval $(call gb_Library_add_exception_objects,sd,\ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/remotecontrol/BufferedStreamSocket \ sd/source/ui/remotecontrol/BufferedStreamSocket \
sd/source/ui/remotecontrol/Communicator \ sd/source/ui/remotecontrol/Communicator \
@@ -550,13 +550,13 @@ $(eval $(call gb_Library_add_objcxxobjects,sd,\
sd/source/ui/remotecontrol/OSXNetworkService \ sd/source/ui/remotecontrol/OSXNetworkService \
)) ))
else else # OS!=MACSOX
ifeq ($(ENABLE_AVAHI),TRUE) ifeq ($(ENABLE_AVAHI),TRUE)
$(eval $(call gb_Library_add_exception_objects,sd,\ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/remotecontrol/AvahiNetworkService \ sd/source/ui/remotecontrol/AvahiNetworkService \
)) ))
endif endif # ENABLE_AVAHI=TRUE
$(eval $(call gb_Library_add_exception_objects,sd,\ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/remotecontrol/DiscoveryService \ sd/source/ui/remotecontrol/DiscoveryService \
@@ -577,15 +577,15 @@ $(eval $(call gb_Library_add_cobjects,sd,\
sd/source/ui/remotecontrol/mDNSResponder/dllmain \ sd/source/ui/remotecontrol/mDNSResponder/dllmain \
)) ))
endif endif # OS=WNT
endif endif # OS!=MACOSX
$(eval $(call gb_Library_add_defs,sd,\ $(eval $(call gb_Library_add_defs,sd,\
-DENABLE_SDREMOTE \ -DENABLE_SDREMOTE \
)) ))
ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),TRUE)
ifneq ($(OS),MACOSX) ifneq ($(OS),MACOSX)
@@ -593,7 +593,7 @@ $(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/remotecontrol/BluetoothServer \ sd/source/ui/remotecontrol/BluetoothServer \
)) ))
else else # OS!=MACOSX
$(eval $(call gb_Library_add_objcxxobjects,sd,\ $(eval $(call gb_Library_add_objcxxobjects,sd,\
sd/source/ui/remotecontrol/BluetoothServer \ sd/source/ui/remotecontrol/BluetoothServer \
@@ -609,14 +609,14 @@ $(eval $(call gb_Library_use_system_darwin_frameworks,sd,\
IOBluetooth \ IOBluetooth \
)) ))
endif endif # OS!=MACOSX
$(eval $(call gb_Library_add_defs,sd,\ $(eval $(call gb_Library_add_defs,sd,\
-DENABLE_SDREMOTE_BLUETOOTH \ -DENABLE_SDREMOTE_BLUETOOTH \
)) ))
endif endif # ENABLE_SDREMOTE_BLUETOOTH=TRUE
endif endif # ENABLE_SDREMOTE=TRUE
# vim: set noet sw=4 ts=4: # vim: set noet sw=4 ts=4:

View File

@@ -15,12 +15,12 @@ $(eval $(call gb_Library_set_include,sdui,\
-I$(SRCDIR)/sd/source/ui/inc \ -I$(SRCDIR)/sd/source/ui/inc \
)) ))
ifeq ($(ENABLE_SDREMOTE),YES) ifeq ($(ENABLE_SDREMOTE),TRUE)
$(eval $(call gb_Library_add_defs,sdui,\ $(eval $(call gb_Library_add_defs,sdui,\
-DENABLE_SDREMOTE \ -DENABLE_SDREMOTE \
)) ))
ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES) ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),TRUE)
$(eval $(call gb_Library_add_defs,sdui,\ $(eval $(call gb_Library_add_defs,sdui,\
-DENABLE_SDREMOTE_BLUETOOTH \ -DENABLE_SDREMOTE_BLUETOOTH \
)) ))