From 06b045b28394e7d0219f626fd1a5b21236a8e303 Mon Sep 17 00:00:00 2001 From: David Robillard Date: Tue, 20 Sep 2011 19:43:18 +0000 Subject: Const correctness. git-svn-id: http://svn.drobilla.net/zix/trunk@36 df6676b4-ccc9-40e5-b5d6-7c4628a128e3 --- wscript | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'wscript') diff --git a/wscript b/wscript index 949d14e..b2521f1 100644 --- a/wscript +++ b/wscript @@ -41,24 +41,25 @@ def configure(conf): conf.load('compiler_c') conf.env.append_value('CFLAGS', '-std=c99') - autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', - atleast_version='2.0.0', mandatory=False) - - # Check for dladdr + # Check for mlock conf.check(function_name='mlock', header_name='sys/mman.h', define_name='HAVE_MLOCK', mandatory=False) + conf.env['BUILD_BENCH'] = Options.options.build_bench conf.env['BUILD_TESTS'] = Options.options.build_tests - if conf.is_defined('HAVE_GLIB'): - conf.env['BUILD_BENCH'] = Options.options.build_bench + if Options.options.build_bench: + autowaf.check_pkg(conf, 'glib-2.0', uselib_store='GLIB', + atleast_version='2.0.0', mandatory=False) + if not conf.is_defined('HAVE_GLIB'): + conf.fatal("Glib is required to build benchmarks") autowaf.define(conf, 'ZIX_VERSION', ZIX_VERSION) conf.write_config_header('zix-config.h', remove=False) autowaf.display_msg(conf, "Unit tests", str(conf.env['BUILD_TESTS'])) - autowaf.display_msg(conf, "Benchmarks", str(conf.env['BUILD_BENCHx'])) + autowaf.display_msg(conf, "Benchmarks", str(conf.env['BUILD_BENCH'])) print('') tests = [ -- cgit v1.2.1