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@googlemail.com>
Tested-by: Rene Engelhard <rene.engelhard.re@googlemail.com>

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@

configure.ac

@@ -860,11 +860,11 @@ AC_ARG_ENABLE(sdremote,
         [Determines whether to enable Impress remote control.]),
 ,enable_sdremote=yes)
 
-AC_ARG_ENABLE(bluetooth,
+AC_ARG_ENABLE(sdremote-bluetooth,
-    AS_HELP_STRING([--disable-bluetooth],
+    AS_HELP_STRING([--disable-sdremote-bluetooth],
         [Determines whether to build sdremote with bluetooth support
-        (via dbus)]),
+         Requires: dbus]),
-,enable_bluetooth=yes)
+,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])
+    AC_MSG_CHECKING([whether to enable sdremote via bluetooth support])
-    if test -n "$enable_bluetooth" -a "$enable_bluetooth" != "no"; then
+    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.

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
 

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
 

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 );

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;