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 | d8ccffb097fc538d9d6355cb1c1246990c96195f (patch) | |
| tree | 1e1f478d8f1b06dc6216b4ff73b9957294315e1d | |
| parent | d80a503898f311bb8d27a21e77bb6a1442f48d22 (diff) | |
| download | lilv-d8ccffb097fc538d9d6355cb1c1246990c96195f.tar.gz lilv-d8ccffb097fc538d9d6355cb1c1246990c96195f.tar.bz2 lilv-d8ccffb097fc538d9d6355cb1c1246990c96195f.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/slv2@2724 a436a847-0d15-0410-975c-d299462d15a1
| -rw-r--r-- | wscript | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -61,9 +61,9 @@ def configure(conf): autowaf.check_pkg(conf, 'redland', uselib_store='REDLAND', atleast_version='1.0.6', mandatory=True) autowaf.check_pkg(conf, 'jack', uselib_store='JACK', atleast_version='0.107.0', mandatory=False) conf.env.append_value('CFLAGS', '-std=c99') - conf.define('SLV2_VERSION', SLV2_VERSION) + autowaf.define(conf, 'SLV2_VERSION', SLV2_VERSION) if Options.options.dyn_manifest: - conf.define('SLV2_DYN_MANIFEST', 1) + autowaf.define(conf, 'SLV2_DYN_MANIFEST', 1) if Options.options.default_lv2_path == '': if Options.platform == 'darwin': @@ -76,7 +76,7 @@ def configure(conf): conf.env['USE_JACK'] = conf.env['HAVE_JACK'] and not Options.options.no_jack conf.env['BUILD_TESTS'] = Options.options.build_tests conf.env['BASH_COMPLETION'] = Options.options.bash_completion - conf.define('SLV2_DEFAULT_LV2_PATH', Options.options.default_lv2_path) + autowaf.define(conf, 'SLV2_DEFAULT_LV2_PATH', Options.options.default_lv2_path) if conf.env['USE_JACK']: autowaf.check_header(conf, 'lv2/lv2plug.in/ns/ext/event/event.h', 'HAVE_LV2_EVENT') |