summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2008-12-22 01:21:50 +0000
committerDavid Robillard <d@drobilla.net>2008-12-22 01:21:50 +0000
commit238d4e8742fcbe7dbe7b53c92e43013bd4afd9c1 (patch)
treecce7a30ab920735bc338cbdffa60f636e3b6069e
parent932dc364870c4d29b06bdfc8c7725b2409967c12 (diff)
downloadpatchage-238d4e8742fcbe7dbe7b53c92e43013bd4afd9c1.tar.gz
patchage-238d4e8742fcbe7dbe7b53c92e43013bd4afd9c1.tar.bz2
patchage-238d4e8742fcbe7dbe7b53c92e43013bd4afd9c1.zip
Fix header/function checks.
Fix LV2core include path. Don't write python style boolean literals to wafconfig.h. Upgrade to waf 1.5.2. git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@1898 a436a847-0d15-0410-975c-d299462d15a1
-rw-r--r--wscript6
1 files changed, 3 insertions, 3 deletions
diff --git a/wscript b/wscript
index c14ca21..436901e 100644
--- a/wscript
+++ b/wscript
@@ -53,9 +53,9 @@ def configure(conf):
conf.define('HAVE_JACK_DBUS', conf.env['HAVE_JACK_DBUS'])
else:
autowaf.check_pkg(conf, 'jack', destvar='JACK', vnum='0.107.0', mandatory=False)
- conf.define('USE_LIBJACK', conf.env['HAVE_JACK'] == 1)
+ conf.define('USE_LIBJACK', int(conf.env['HAVE_JACK'] == 1))
- conf.define('HAVE_JACK_MIDI', conf.env['HAVE_JACK'] == 1 or conf.env['HAVE_JACK_DBUS'] == 1)
+ conf.define('HAVE_JACK_MIDI', int(conf.env['HAVE_JACK'] == 1 or conf.env['HAVE_JACK_DBUS'] == 1))
# Use Alsa if present unless --no-alsa
if not Options.options.no_alsa and conf.env['HAVE_ALSA'] != 1:
@@ -95,7 +95,7 @@ def configure(conf):
autowaf.display_msg(conf, "App human name", "'" + conf.env['APP_HUMAN_NAME'] + "'", 'CYAN')
autowaf.display_msg(conf, "Jack (D-Bus)", str(conf.env['HAVE_JACK_DBUS']))
autowaf.display_msg(conf, "LASH (D-Bus)", str(conf.env['HAVE_LASH'] == 1))
- autowaf.display_msg(conf, "Jack (libjack)", str(conf.env['USE_LIBJACK']))
+ autowaf.display_msg(conf, "Jack (libjack)", str(bool(conf.env['USE_LIBJACK'])))
autowaf.display_msg(conf, "Alsa Sequencer", str(conf.env['HAVE_ALSA'] == 1))
print