diff options
| author | David Robillard <d@drobilla.net> | 2008-10-02 23:37:38 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-10-02 23:37:38 +0000 |
| commit | bbbf37272e07b47f7b69c3eb93ce4b7c4531b7cc (patch) | |
| tree | ecbbec04ed40917faa1c7f8b30ce1d6b8bf2d1de | |
| parent | b7e3d61cd27416e935d183da2be6a5ce8f84d311 (diff) | |
| download | lilv-bbbf37272e07b47f7b69c3eb93ce4b7c4531b7cc.tar.gz lilv-bbbf37272e07b47f7b69c3eb93ce4b7c4531b7cc.tar.bz2 lilv-bbbf37272e07b47f7b69c3eb93ce4b7c4531b7cc.zip | |
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
| -rw-r--r-- | utils/lv2_inspect.c | 2 | ||||
| -rw-r--r-- | utils/lv2_list.c | 2 | ||||
| -rw-r--r-- | wscript | 15 |
3 files changed, 7 insertions, 12 deletions
diff --git a/utils/lv2_inspect.c b/utils/lv2_inspect.c index 035ac0c..901cf96 100644 --- a/utils/lv2_inspect.c +++ b/utils/lv2_inspect.c @@ -224,7 +224,7 @@ print_plugin(SLV2Plugin p) void print_version() { - printf("lv2_inspect (slv2) " PACKAGE_VERSION "\n"); + printf("lv2_inspect (slv2) " SLV2_VERSION "\n"); printf("Copyright (C) 2007 Dave Robillard <dave@drobilla.net>\n"); printf("License: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"); printf("This is free software: you are free to change and redistribute it.\n"); diff --git a/utils/lv2_list.c b/utils/lv2_list.c index 1996a91..18aa911 100644 --- a/utils/lv2_list.c +++ b/utils/lv2_list.c @@ -35,7 +35,7 @@ list_plugins(SLV2Plugins list) void print_version() { - printf("lv2_list (slv2) " PACKAGE_VERSION "\n"); + printf("lv2_list (slv2) " SLV2_VERSION "\n"); printf("Copyright (C) 2007 Dave Robillard <dave@drobilla.net>\n"); printf("License: GNU GPL version 2 or later <http://gnu.org/licenses/gpl.html>\n"); printf("This is free software: you are free to change and redistribute it.\n"); @@ -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') |