From bbbf37272e07b47f7b69c3eb93ce4b7c4531b7cc Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 2 Oct 2008 23:37:38 +0000 Subject: Factor out avoid-repeated-checks thing to autowaf. Saves lines in wscripts.... Use SLV2_VERSION instead of PACKAGE_VERSION in slv2 code to play nice with others. git-svn-id: http://svn.drobilla.net/lad/trunk/slv2@1598 a436a847-0d15-0410-975c-d299462d15a1 --- wscript | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 8526d3e..ccc74df 100644 --- a/wscript +++ b/wscript @@ -40,19 +40,14 @@ def set_options(opt): def configure(conf): autowaf.configure(conf) - if not conf.env['CC']: - conf.check_tool('compiler_cc') - if not conf.env['HAVE_LV2CORE']: - conf.check_pkg('lv2core', destvar='LV2CORE', vnum='1', mandatory=True) - if not conf.env['HAVE_REDLAND']: - conf.check_pkg('redland', destvar='REDLAND', vnum='1.0.6', mandatory=True) - if not conf.env['HAVE_JACK']: - conf.check_pkg('jack', destvar='JACK', vnum='0.107.0', mandatory=False) + autowaf.check_tool(conf, 'compiler_cc') + autowaf.check_pkg(conf, 'lv2core', destvar='LV2CORE', vnum='1', mandatory=True) + autowaf.check_pkg(conf, 'redland', destvar='REDLAND', vnum='1.0.6', mandatory=True) + autowaf.check_pkg(conf, 'jack', destvar='JACK', vnum='0.107.0', mandatory=False) conf.env.append_value('CCFLAGS', '-std=c99') - conf.define('PACKAGE_VERSION', VERSION) + conf.define('SLV2_VERSION', SLV2_VERSION) conf.write_config_header('waf-config.h') conf.env.append_value('CCFLAGS', '-DCONFIG_H_PATH=\\\"waf-config.h\\\"') - conf.env.append_value('CCFLAGS', '-DPACKAGE_VERSION=\\\"' + VERSION + '\\\"') autowaf.print_summary(conf) autowaf.display_header('SLV2 Configuration') -- cgit v1.2.1