[Libreoffice-commits] .: config_host.mk.in configure.ac sd/Library_sd.mk sd/Library_sdui.mk sd/source
Libreoffice Gerrit user
logerrit at kemper.freedesktop.org
Fri Nov 16 05:55:43 PST 2012
config_host.mk.in | 2 +-
configure.ac | 20 ++++++++++----------
sd/Library_sd.mk | 4 ++--
sd/Library_sdui.mk | 4 ++--
sd/source/ui/dlg/RemoteDialog.cxx | 6 +++---
sd/source/ui/remotecontrol/Server.cxx | 6 +++---
6 files changed, 21 insertions(+), 21 deletions(-)
New commits:
commit 0e682df529bb9216e009da39c449dab29ccf2807
Author: Enrico Weigelt, metux ITS <metuxitservice at googlemail.com>
Date: Fri Nov 16 00:00:58 2012 +0100
renamed --enable-bluetooth to --enable-sdremote-bluetooth
The current configure option --enable-bluetooth is a bit misleading,
it doesn't really tell what it's actually for. Therefore renamed it,
so it's more clear that it's an sdremote backend using bluetooth.
Change-Id: Ia8b46ee001ea112b80521baa502dcab2bb7e83aa
Reviewed-on: https://gerrit.libreoffice.org/1086
Reviewed-by: Rene Engelhard <rene.engelhard.re at googlemail.com>
Tested-by: Rene Engelhard <rene.engelhard.re at googlemail.com>
diff --git a/config_host.mk.in b/config_host.mk.in
index d099160..a5f8f40 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -171,7 +171,7 @@ export ENABLE_QUICKSTART_LIBPNG=@ENABLE_QUICKSTART_LIBPNG@
export ENABLE_RANDR=@ENABLE_RANDR@
export ENABLE_RELEASE_BUILD=@ENABLE_RELEASE_BUILD@
export ENABLE_SDREMOTE=@ENABLE_SDREMOTE@
-export ENABLE_BLUETOOTH=@ENABLE_BLUETOOTH@
+export ENABLE_SDREMOTE_BLUETOOTH=@ENABLE_SDREMOTE_BLUETOOTH@
export ENABLE_REPORTBUILDER=@ENABLE_REPORTBUILDER@
export ENABLE_SCRIPTING_BEANSHELL=@ENABLE_SCRIPTING_BEANSHELL@
export ENABLE_SCRIPTING_JAVASCRIPT=@ENABLE_SCRIPTING_JAVASCRIPT@
diff --git a/configure.ac b/configure.ac
index 0127214..9b9b990 100644
--- a/configure.ac
+++ b/configure.ac
@@ -860,11 +860,11 @@ AC_ARG_ENABLE(sdremote,
[Determines whether to enable Impress remote control.]),
,enable_sdremote=yes)
-AC_ARG_ENABLE(bluetooth,
- AS_HELP_STRING([--disable-bluetooth],
+AC_ARG_ENABLE(sdremote-bluetooth,
+ AS_HELP_STRING([--disable-sdremote-bluetooth],
[Determines whether to build sdremote with bluetooth support
- (via dbus)]),
-,enable_bluetooth=yes)
+ Requires: dbus]),
+,enable_sdremote_bluetooth=yes)
AC_ARG_ENABLE(gconf,
AS_HELP_STRING([--disable-gconf],
@@ -9524,12 +9524,12 @@ AC_MSG_CHECKING([whether to enable sd remotecontrol])
if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
AC_MSG_RESULT([yes])
ENABLE_SDREMOTE=YES
- AC_MSG_CHECKING([whether to enable bluetooth support])
- if test -n "$enable_bluetooth" -a "$enable_bluetooth" != "no"; then
+ AC_MSG_CHECKING([whether to enable sdremote via bluetooth support])
+ if test -n "$enable_sdremote_bluetooth" -a "$enable_sdremote_bluetooth" != "no"; then
if test "$OS" = "LINUX"; then
if test "$ENABLE_DBUS" = "TRUE"; then
AC_MSG_RESULT([yes])
- ENABLE_BLUETOOTH=YES
+ ENABLE_SDREMOTE_BLUETOOTH=YES
dnl ===================================================================
dnl Check for system bluez
dnl ===================================================================
@@ -9544,11 +9544,11 @@ if test -n "$enable_sdremote" -a "$enable_sdremote" != "no"; then
fi
else
AC_MSG_RESULT([no, dbus disabled])
- ENABLE_BLUETOOTH=NO
+ ENABLE_SDREMOTE_BLUETOOTH=NO
fi
else
AC_MSG_RESULT([no])
- ENABLE_BLUETOOTH=NO
+ ENABLE_SDREMOTE_BLUETOOTH=NO
fi
fi
else
@@ -9556,7 +9556,7 @@ else
AC_MSG_RESULT([no])
fi
AC_SUBST(ENABLE_SDREMOTE)
-AC_SUBST(ENABLE_BLUETOOTH)
+AC_SUBST(ENABLE_SDREMOTE_BLUETOOTH)
dnl ===================================================================
dnl Check whether the gtk 2.0 libraries are available.
diff --git a/sd/Library_sd.mk b/sd/Library_sd.mk
index ae4b8a5..227a3c0 100644
--- a/sd/Library_sd.mk
+++ b/sd/Library_sd.mk
@@ -527,13 +527,13 @@ $(eval $(call gb_Library_add_defs,sd,\
-DENABLE_SDREMOTE \
))
-ifeq ($(ENABLE_BLUETOOTH),YES)
+ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES)
$(eval $(call gb_Library_add_exception_objects,sd,\
sd/source/ui/remotecontrol/BluetoothServer \
))
$(eval $(call gb_Library_add_defs,sd,\
- -DENABLE_BLUETOOTH \
+ -DENABLE_SDREMOTE_BLUETOOTH \
))
endif
diff --git a/sd/Library_sdui.mk b/sd/Library_sdui.mk
index 9d4ec75..2304d49 100644
--- a/sd/Library_sdui.mk
+++ b/sd/Library_sdui.mk
@@ -42,9 +42,9 @@ $(eval $(call gb_Library_add_defs,sdui,\
-DENABLE_SDREMOTE \
))
-ifeq ($(ENABLE_BLUETOOTH),YES)
+ifeq ($(ENABLE_SDREMOTE_BLUETOOTH),YES)
$(eval $(call gb_Library_add_defs,sdui,\
- -DENABLE_BLUETOOTH \
+ -DENABLE_SDREMOTE_BLUETOOTH \
))
endif
diff --git a/sd/source/ui/dlg/RemoteDialog.cxx b/sd/source/ui/dlg/RemoteDialog.cxx
index 1d52dc5..d5c66ca 100644
--- a/sd/source/ui/dlg/RemoteDialog.cxx
+++ b/sd/source/ui/dlg/RemoteDialog.cxx
@@ -28,7 +28,7 @@ RemoteDialog::RemoteDialog( Window *pWindow ) :
#ifdef ENABLE_SDREMOTE
FreeResource();
-#ifdef ENABLE_BLUETOOTH
+#ifdef ENABLE_SDREMOTE_BLUETOOTH
mPreviouslyDiscoverable = RemoteServer::isBluetoothDiscoverable();
if ( !mPreviouslyDiscoverable )
RemoteServer::setBluetoothDiscoverable( true );
@@ -61,7 +61,7 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton)
{
// setBusy( true );
// Fixme: Try and connect
-#if defined(ENABLE_SDREMOTE) && defined(ENABLE_BLUETOOTH)
+#if defined(ENABLE_SDREMOTE) && defined(ENABLE_SDREMOTE_BLUETOOTH)
long aSelected = mClientBox.GetActiveEntryIndex();
if ( aSelected < 0 )
return 1;
@@ -79,7 +79,7 @@ IMPL_LINK_NOARG(RemoteDialog, HandleConnectButton)
IMPL_LINK_NOARG( RemoteDialog, CloseHdl )
{
-#if defined(ENABLE_SDREMOTE) && defined(ENABLE_BLUETOOTH)
+#if defined(ENABLE_SDREMOTE) && defined(ENABLE_SDREMOTE_BLUETOOTH)
if ( !mPreviouslyDiscoverable )
{
RemoteServer::setBluetoothDiscoverable( false );
diff --git a/sd/source/ui/remotecontrol/Server.cxx b/sd/source/ui/remotecontrol/Server.cxx
index 69a53f4..c2bff30 100644
--- a/sd/source/ui/remotecontrol/Server.cxx
+++ b/sd/source/ui/remotecontrol/Server.cxx
@@ -175,7 +175,7 @@ void RemoteServer::setup()
spServer = new RemoteServer();
spServer->launch();
-#ifdef ENABLE_BLUETOOTH
+#ifdef ENABLE_SDREMOTE_BLUETOOTH
sd::BluetoothServer::setup( &(spServer->mCommunicators) );
#endif
}
@@ -309,7 +309,7 @@ void SdDLL::RegisterRemotes()
bool RemoteServer::isBluetoothDiscoverable()
{
-#ifdef ENABLE_BLUETOOTH
+#ifdef ENABLE_SDREMOTE_BLUETOOTH
return BluetoothServer::isDiscoverable();
#else
return false;
@@ -318,7 +318,7 @@ bool RemoteServer::isBluetoothDiscoverable()
void RemoteServer::setBluetoothDiscoverable( bool aDiscoverable )
{
-#ifdef ENABLE_BLUETOOTH
+#ifdef ENABLE_SDREMOTE_BLUETOOTH
BluetoothServer::setDiscoverable( aDiscoverable );
#else
(void) aDiscoverable;
More information about the Libreoffice-commits
mailing list