diff options
| author | David Robillard <d@drobilla.net> | 2011-01-08 15:28:48 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2011-01-08 15:28:48 +0000 |
| commit | 4c41b9240003e88c7dae7ba10dcca5ccd5a911dc (patch) | |
| tree | 6e79c9e5388d174b18a7706684f0e097a3abc430 /wscript | |
| parent | f8381e5fa077ad03e270b8697fa9d094c845fe14 (diff) | |
| download | patchage-4c41b9240003e88c7dae7ba10dcca5ccd5a911dc.tar.gz patchage-4c41b9240003e88c7dae7ba10dcca5ccd5a911dc.tar.bz2 patchage-4c41b9240003e88c7dae7ba10dcca5ccd5a911dc.zip | |
Fix configuration header define names to not stomp on global namespace.
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@2794 a436a847-0d15-0410-975c-d299462d15a1
Diffstat (limited to 'wscript')
| -rw-r--r-- | wscript | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -61,7 +61,7 @@ def configure(conf): else: autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.107.0', mandatory=False) if conf.env['HAVE_JACK'] == 1: - autowaf.define(conf, 'USE_LIBJACK', 1) + autowaf.define(conf, 'PATCHAGE_LIBJACK', 1) autowaf.define(conf, 'HAVE_JACK_MIDI', int(conf.env['HAVE_JACK'] == 1 or conf.env['HAVE_JACK_DBUS'] == 1)) @@ -90,7 +90,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'] == 1)) + autowaf.display_msg(conf, "Jack (libjack)", str(conf.env['PATCHAGE_LIBJACK'] == 1)) autowaf.display_msg(conf, "Alsa Sequencer", str(conf.env['HAVE_ALSA'] == 1)) print @@ -125,7 +125,7 @@ def build(bld): ''' if bld.env['HAVE_LASH'] or bld.env['HAVE_JACK_DBUS']: prog.source += ' src/DBus.cpp ' - if bld.env['USE_LIBJACK']: + if bld.env['PATCHAGE_LIBJACK']: prog.source += ' src/JackDriver.cpp ' prog.uselib += ' JACK ' if bld.env['HAVE_ALSA'] == 1: |