From 2ebbddc12e45ee8784ff3137d95f00005308317b Mon Sep 17 00:00:00 2001 From: "Gustavo J. A. M. Carneiro" Date: Wed, 21 Sep 2011 19:10:14 +0100 Subject: [PATCH] Don't fail on missing sudo or valgrind --- wscript | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/wscript b/wscript index c4157b0b3..744b04c6a 100644 --- a/wscript +++ b/wscript @@ -388,7 +388,10 @@ def configure(conf): conf.sub_config('src/mpi') # for suid bits - conf.find_program('sudo', var='SUDO') + try: + conf.find_program('sudo', var='SUDO') + except WafError: + pass why_not_sudo = "because we like it" if Options.options.enable_sudo and conf.env['SUDO']: @@ -452,7 +455,10 @@ def configure(conf): conf.report_optional_feature("ENABLE_EXAMPLES", "Build examples", env['ENABLE_EXAMPLES'], why_not_examples) - conf.find_program('valgrind', var='VALGRIND') + try: + conf.find_program('valgrind', var='VALGRIND') + except WafError: + pass # These flags are used for the implicitly dependent modules. if env['ENABLE_STATIC_NS3']: