diff options
| author | David Robillard <d@drobilla.net> | 2008-10-01 02:51:51 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-01 02:51:51 +0000 |
| commit | e94bb5bb095283fd2f5c5c601ec3e13ef1a5e499 (patch) | |
| tree | f52a6404f3b9c96460d6da487578e1950ab691db | |
| parent | df9adc430fe5f3d3d4c9c02a0dad1826da474799 (diff) | |
| download | patchage-e94bb5bb095283fd2f5c5c601ec3e13ef1a5e499.tar.gz patchage-e94bb5bb095283fd2f5c5c601ec3e13ef1a5e499.tar.bz2 patchage-e94bb5bb095283fd2f5c5c601ec3e13ef1a5e499.zip | |
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
| -rw-r--r-- | wscript | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -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') |