From e07313b335f0851bbcc6d9f1ec7a55f888adb14b Mon Sep 17 00:00:00 2001 From: Mathieu Lacage Date: Wed, 30 Mar 2011 14:12:46 +0200 Subject: [PATCH] Try to check for nsc if it was installed --- src/internet/wscript | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/src/internet/wscript b/src/internet/wscript index 33f377fb0..1c3e9339a 100644 --- a/src/internet/wscript +++ b/src/internet/wscript @@ -73,21 +73,22 @@ def configure(conf): lib_to_check = 'liblinux2.6.26.so' - if not os.path.exists(os.path.join(conf.env['WITH_NSC'], lib_to_check)): + found = False + for path in ['.', 'lib', 'lib64']: + if os.path.exists(os.path.join(conf.env['WITH_NSC'], path, lib_to_check)): + # append the NSC kernel dirs to the module path so that these dirs + # will end up in the LD_LIBRARY_PATH, thus allowing the NSC NS-3 + # module to find the necessary NSC shared libraries. + found = True + for nsc_module in ['linux-2.6.18', 'linux-2.6.26']: + conf.env.append_value('NS3_MODULE_PATH', + os.path.abspath(os.path.join(conf.env['WITH_NSC'], path, nsc_module))) + if not found: conf.env['NSC_ENABLED'] = False conf.report_optional_feature("nsc", "Network Simulation Cradle", False, - "NSC library %s is missing: NSC has not been built?" % lib_to_check) - return - - # append the NSC kernel dirs to the module path so that these dirs - # will end up in the LD_LIBRARY_PATH, thus allowing the NSC NS-3 - # module to find the necessary NSC shared libraries. - for nsc_module in ['linux-2.6.18', 'linux-2.6.26']: - conf.env.append_value('NS3_MODULE_PATH', - os.path.abspath(os.path.join(conf.env['WITH_NSC'], nsc_module))) - - conf.report_optional_feature("nsc", "Network Simulation Cradle", True, "") - + "NSC library %s is missing: NSC has not been built?" % lib_to_check) + else: + conf.report_optional_feature("nsc", "Network Simulation Cradle", True, "") def build(bld):