From e94bb5bb095283fd2f5c5c601ec3e13ef1a5e499 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Wed, 1 Oct 2008 02:51:51 +0000 Subject: Fix building against libjack when built as a child with --no-jack-dbus. git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1570 a436a847-0d15-0410-975c-d299462d15a1 --- wscript | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index 3b400f8..e573327 100644 --- a/wscript +++ b/wscript @@ -64,8 +64,9 @@ def configure(conf): conf.env['HAVE_JACK_DBUS'] = conf.env['HAVE_DBUS'] and not Params.g_options.no_jack_dbus if conf.env['HAVE_JACK_DBUS']: conf.define('HAVE_JACK_DBUS', True) - elif not conf.env['HAVE_JACK']: - conf.check_pkg('jack', destvar='JACK', vnum='0.107.0', mandatory=False) + else: + if not conf.env['HAVE_JACK']: + conf.check_pkg('jack', destvar='JACK', vnum='0.107.0', mandatory=False) conf.define('USE_LIBJACK', conf.env['HAVE_JACK']) # Use Alsa if present unless --no-alsa @@ -97,6 +98,7 @@ def configure(conf): conf.write_config_header('waf-config.h') print + print 'Patchage Configuration:' display_msg("Install prefix", conf.env['PREFIX'], 'CYAN') display_msg("Install name", "'" + conf.env['APP_INSTALL_NAME'] + "'", 'CYAN') display_msg("App human name", "'" + conf.env['APP_HUMAN_NAME'] + "'", 'CYAN') -- cgit v1.2.1