diff options
| author | David Robillard <d@drobilla.net> | 2011-11-25 09:32:08 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-11-25 09:32:08 +0000 |
| commit | 1ef98ade34387ec4cebb9f2e004492ecb9dde6b9 (patch) | |
| tree | bc5937ffaeaced2639f8aa3f77065f3a7de7f2c1 /wscript | |
| parent | bd85cff0cfe86d87cbe895ac0591d83f7e82c03b (diff) | |
| download | patchage-1ef98ade34387ec4cebb9f2e004492ecb9dde6b9.tar.gz patchage-1ef98ade34387ec4cebb9f2e004492ecb9dde6b9.tar.bz2 patchage-1ef98ade34387ec4cebb9f2e004492ecb9dde6b9.zip | |
Fix JACK checking so compilation works with old Jack (just without session support).
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@3630 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 14 |
1 files changed, 6 insertions, 8 deletions
@@ -74,16 +74,14 @@ def configure(conf): autowaf.define(conf, 'HAVE_JACK_DBUS', 1) else: autowaf.check_pkg(conf, 'jack', uselib_store='JACK', - atleast_version='0.120.0', mandatory=False) + atleast_version='0.107.0', mandatory=False) if conf.is_defined('HAVE_JACK'): autowaf.define(conf, 'PATCHAGE_LIBJACK', 1) if not Options.options.no_jack_session: - autowaf.define(conf, 'PATCHAGE_JACK_SESSION', 1) - else: - autowaf.check_pkg(conf, 'jack', uselib_store='JACK', - atleast_version='0.107.0', mandatory=False) - if conf.is_defined('HAVE_JACK'): - autowaf.define(conf, 'PATCHAGE_LIBJACK', 1) + autowaf.check_pkg(conf, 'jack', uselib_store='NEW_JACK', + atleast_version='0.120.0', mandatory=False) + if conf.is_defined('HAVE_NEW_JACK'): + autowaf.define(conf, 'PATCHAGE_JACK_SESSION', 1) # Use Alsa if present unless --no-alsa if not Options.options.no_alsa: @@ -141,7 +139,7 @@ def build(bld): prog.source += ' src/DBus.cpp ' if bld.is_defined('PATCHAGE_LIBJACK'): prog.source += ' src/JackDriver.cpp ' - prog.uselib += ' JACK ' + prog.uselib += ' JACK NEWJACK ' if bld.is_defined('HAVE_ALSA'): prog.source += ' src/AlsaDriver.cpp ' prog.uselib += ' ALSA ' |