waf: Use JACK_DBUS define and thus make clientlib try dbus activation first

git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@2410 0c269be4-1314-0410-8aa9-9f06e86f4224

common/wscript

@@ -8,7 +8,6 @@ def build(bld):
         'JackClient.cpp',
         'JackConnectionManager.cpp',
         'ringbuffer.c',
-        'JackServerLaunch.cpp',
         'JackError.cpp',
         'JackFrameTimer.cpp',
         'JackGraphManager.cpp',
@@ -64,6 +63,8 @@ def build(bld):
     clientlib = bld.create_obj('cpp', 'shlib')
     clientlib.features.append('cc')
     clientlib.defines = 'HAVE_CONFIG_H'
+    if bld.env()['BUILD_JACKDBUS'] == True:
+        clientlib.uselib = ['DBUS-1']
     clientlib.includes = ['.', './jack', '..', '../linux']
     clientlib.name         = 'clientlib'
     clientlib.target       = 'jack'
@@ -73,4 +74,5 @@ def build(bld):
         'JackLibClient.cpp',
         'JackLibAPI.cpp',
         'JackSocketClientChannel.cpp',
+        'JackServerLaunch.cpp', 
         ]

wscript

@@ -62,6 +62,8 @@ def configure(conf):
     conf.define('__SMP__', 1)
     conf.define('USE_POSIX_SHM', 1)
     conf.define('JACK_SVNREVISION', fetch_svn_revision('.'))
+    if conf.env['BUILD_JACKDBUS'] == True:
+        conf.define('JACK_DBUS', 1)
     conf.write_config_header('config.h')
 
     display_msg("\n==================")
@@ -79,6 +81,6 @@ def build(bld):
     # process subfolders from here
     bld.add_subdirs('common')
     bld.add_subdirs('linux')
-    if Params.g_options.dbus:
+    if bld.env()['BUILD_JACKDBUS'] == True:
         bld.add_subdirs('linux/dbus')
     bld.add_subdirs('example-clients')