From 871d6fa21ee5f85748e29e0552303980d4a75542 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Thu, 2 Oct 2008 01:49:02 +0000 Subject: Factor more things into autowaf. Only call autowaf functions once no matter how many sub-projects call them (global counter, barf). Print pretty summary for everything with options, in order so you can see which project caused which check. git-svn-id: http://svn.drobilla.net/lad/trunk/ingen@1581 a436a847-0d15-0410-975c-d299462d15a1 --- wscript | 13 +++++++++++-- 1 file changed, 11 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index a411a7cc..26aca704 100644 --- a/wscript +++ b/wscript @@ -15,6 +15,7 @@ srcdir = '.' blddir = 'build' def set_options(opt): + autowaf.set_options(opt) opt.tool_options('compiler_cxx') opt.add_option('--data-dir', type='string', dest='datadir', help="Ingen data install directory [Default: PREFIX/share/ingen]") @@ -22,6 +23,7 @@ def set_options(opt): help="Ingen module install directory [Default: PREFIX/lib/ingen]") def configure(conf): + autowaf.configure(conf) if not conf.env['CXX']: conf.check_tool('compiler_cxx') if not conf.env['HAVE_GLIBMM']: @@ -49,9 +51,16 @@ def configure(conf): if not conf.env['HAVE_REDLANDMM']: conf.check_pkg('redlandmm', destvar='REDLANDMM', vnum='0.0.0', mandatory=False) conf.env['INGEN_VERSION'] = INGEN_VERSION - conf.env.append_value('CCFLAGS', '-DCONFIG_H_PATH=\\\"waf-config.h\\\"') - conf.env.append_value('CXXFLAGS', '-DCONFIG_H_PATH=\\\"waf-config.h\\\"') + conf.env['BUILD_GUI'] = bool(conf.env['GLADEMM']) conf.write_config_header('waf-config.h') + + autowaf.print_summary(conf) + print '= Ingen Configuration =' + autowaf.display_msg("Jack", str(bool(conf.env['HAVE_JACK_DBUS'])), 'YELLOW') + autowaf.display_msg("OSC", str(bool(conf.env['HAVE_LIBLO'])), 'YELLOW') + autowaf.display_msg("HTTP", str(bool(conf.env['HAVE_SOUP'])), 'YELLOW') + autowaf.display_msg("LV2", str(bool(conf.env['HAVE_SOUP'])), 'YELLOW') + print def build(bld): opts = Params.g_options -- cgit v1.2.1