From 00a05b846b308025bf67d742e3c1d58c98edad14 Mon Sep 17 00:00:00 2001
From: nedko <nedko@0c269be4-1314-0410-8aa9-9f06e86f4224>
Date: Tue, 7 Jul 2009 18:10:00 +0000
Subject: [PATCH] Remove libjack dependency on libdbus for mixed scenario; fix
warning.
Warning is fixed by removing the static functions related to classic launch when libdbus launch is used.
For classic (jackd only) and mixed (jackd and jackdbus) scenarios we don't use libdbus for launching.
For jackdus only scenario, we use only libdbus.
So there is no change in classic and dbus scnearios. Change only affects the mixed scenario.
git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@3581 0c269be4-1314-0410-8aa9-9f06e86f4224
---
common/wscript | 2 +-
posix/JackPosixServerLaunch.cpp | 8 +++++---
wscript | 2 ++
3 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/common/wscript b/common/wscript
index 2d491e75..2d2f4250 100644
--- a/common/wscript
+++ b/common/wscript
@@ -180,7 +180,7 @@ def build(bld):
clientlib.defines = 'HAVE_CONFIG_H'
clientlib.uselib = uselib
clientlib.install_path = '${LIBDIR}'
- if bld.env['BUILD_JACKDBUS'] == True:
+ if bld.env['BUILD_JACKDBUS'] == True and bld.env['BUILD_JACKD'] == False:
clientlib.uselib.append('DBUS-1')
clientlib.includes = includes
clientlib.name = 'clientlib'
diff --git a/posix/JackPosixServerLaunch.cpp b/posix/JackPosixServerLaunch.cpp
index 1931474d..855a2c59 100644
--- a/posix/JackPosixServerLaunch.cpp
+++ b/posix/JackPosixServerLaunch.cpp
@@ -26,7 +26,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
using namespace Jack;
-#if defined(JACK_DBUS)
+#if defined(USE_LIBDBUS_AUTOLAUNCH)
#include <dbus/dbus.h>
@@ -73,7 +73,7 @@ static int start_server_dbus(const char* server_name)
return 0;
}
-#endif
+#else
/* Exec the JACK server in this process. Does not return. */
static void start_server_classic_aux(const char* server_name)
@@ -189,13 +189,15 @@ static int start_server_classic(const char* server_name)
return 0; /* (probably) successful */
}
+#endif
+
static int start_server(const char* server_name, jack_options_t options)
{
if ((options & JackNoStartServer) || getenv("JACK_NO_START_SERVER")) {
return 1;
}
-#if defined(JACK_DBUS)
+#if defined(USE_LIBDBUS_AUTOLAUNCH)
return start_server_dbus(server_name);
#else
return start_server_classic(server_name);
diff --git a/wscript b/wscript
index c0499682..32bbccef 100644
--- a/wscript
+++ b/wscript
@@ -143,6 +143,8 @@ def configure(conf):
conf.define('JACKMP', 1)
if conf.env['BUILD_JACKDBUS'] == True:
conf.define('JACK_DBUS', 1)
+ if conf.env['BUILD_JACKD'] == False:
+ conf.define('USE_LIBDBUS_AUTOLAUNCH', 1)
if conf.env['BUILD_WITH_PROFILE'] == True:
conf.define('JACK_MONITOR', 1)
if conf.env['BUILD_WITH_32_64'] == True:
--
GitLab