diff options
| author | David Robillard <d@drobilla.net> | 2010-12-16 21:39:53 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2010-12-16 21:39:53 +0000 |
| commit | c283ec04fa3bf728d34d9ef2a8dd74576b4e821b (patch) | |
| tree | ff403745a975d834915df930dd8cb4dd77169c31 | |
| parent | da14bd7e22e90e52652e24132f4f38c1f6bd1376 (diff) | |
| download | patchage-c283ec04fa3bf728d34d9ef2a8dd74576b4e821b.tar.gz patchage-c283ec04fa3bf728d34d9ef2a8dd74576b4e821b.tar.bz2 patchage-c283ec04fa3bf728d34d9ef2a8dd74576b4e821b.zip | |
Fix use of conf.define and subsequent check in conf.env (no longer works with waf 1.6) (fix ticket #610).
git-svn-id: http://svn.drobilla.net/lad/trunk/patchage@2724 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | wscript | 7 |
1 files changed, 1 insertions, 6 deletions
@@ -60,17 +60,12 @@ def configure(conf): autowaf.define(conf, '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: + if not Options.options.no_alsa: autowaf.check_pkg(conf, 'alsa', uselib_store='ALSA', mandatory=False) - if conf.env['HAVE_ALSA']: - conf.define('HAVE_ALSA', 1) # Use LASH if we have DBUS unless --no-lash if not Options.options.no_lash and conf.env['HAVE_DBUS_GLIB']: - conf.env['HAVE_LASH'] = 1 autowaf.define(conf, 'HAVE_LASH', 1) - else: - conf.env['HAVE_LASH'] = False # Boost headers autowaf.check_header(conf, 'boost/shared_ptr.hpp', mandatory=True) |