F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Correct some configuration Checking for... messages

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2011-09-20 14:25:45 +01:00
parent 654372b4dd
commit fbf0db7647
3 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/click/wscript
View File

@@ -20,16 +20,16 @@ def configure(conf):
if Options.options.with_nsclick:
if os.path.isdir(Options.options.with_nsclick):
conf.msg("libnsclick.so location", ("%s (given)" % Options.options.with_nsclick))
conf.msg("Checking for libnsclick.so location", ("%s (given)" % Options.options.with_nsclick))
conf.env['WITH_NSCLICK'] = os.path.abspath(Options.options.with_nsclick)
else:
nsclick_dir = os.path.join('..','click')
if os.path.isdir(nsclick_dir):
conf.msg("click location", ("%s (guessed)" % nsclick_dir))
conf.msg("Checking for click location", ("%s (guessed)" % nsclick_dir))
conf.env['WITH_NSCLICK'] = os.path.abspath(nsclick_dir)
del nsclick_dir
if not conf.env['WITH_NSCLICK']:
conf.msg("click location", False)
conf.msg("Checking for click location", False)
conf.report_optional_feature("nsclick", "NS-3 Click Integration", False,
"nsclick not enabled (see option --with-nsclick)")
@@ -77,8 +77,8 @@ int main()
conf.env['INCLUDES_NSCLICK'] = [os.path.abspath(os.path.join(conf.env['WITH_NSCLICK'],'include'))]
conf.env['LIB_NSCLICK'] = ['nsclick']
conf.env['DEFINES_NSCLICK'] = ['NS3_CLICK']
conf.env['NSCLICK'] = conf.check_nonfatal(fragment=test_code, use='DL NSCLICK')
conf.env['NSCLICK'] = conf.check_nonfatal(fragment=test_code, use='DL NSCLICK',
msg="Checking for library nsclick")
conf.report_optional_feature("nsclick", "NS-3 Click Integration",
conf.env['NSCLICK'], "nsclick library not found")
if not conf.env['NSCLICK']:

10
src/internet/wscript
View File

@@ -32,23 +32,23 @@ def configure(conf):
# Check for the location of NSC
if Options.options.with_nsc:
if os.path.isdir(Options.options.with_nsc):
conf.msg("NSC location", ("%s (given)" % Options.options.with_nsc))
conf.msg("Checking for NSC location", ("%s (given)" % Options.options.with_nsc))
conf.env['WITH_NSC'] = os.path.abspath(Options.options.with_nsc)
else:
# ns-3-dev uses ../nsc, while ns-3 releases use ../NSC_RELEASE_NAME
nsc_dir = os.path.join('..', "nsc")
nsc_release_dir = os.path.join('..', NSC_RELEASE_NAME)
if os.path.isdir(nsc_dir):
conf.msg("NSC location",("%s (guessed)" % nsc_dir))
conf.msg("Checking for NSC location",("%s (guessed)" % nsc_dir))
conf.env['WITH_NSC'] = os.path.abspath(nsc_dir)
elif os.path.isdir(nsc_release_dir):
conf.msg("NSC location", ("%s (guessed)" % nsc_release_dir))
conf.msg("Checking for NSC location", ("%s (guessed)" % nsc_release_dir))
conf.env['WITH_NSC'] = os.path.abspath(nsc_release_dir)
del nsc_dir
del nsc_release_dir
if not conf.env['WITH_NSC']:
conf.msg("NSC location", False)
conf.msg("Checking for NSC location", False)
conf.report_optional_feature("nsc", "Network Simulation Cradle", False,
"NSC not found (see option --with-nsc)")
return
@@ -63,7 +63,7 @@ def configure(conf):
conf.env.append_value('CXXDEFINES', 'NETWORK_SIMULATION_CRADLE')
conf.check_nonfatal(mandatory=True, lib='dl', define_name='HAVE_DL', uselib='DL')
ok = True
conf.msg('NSC supported architecture ' + arch, ok)
conf.msg('Checking for NSC supported architecture ' + arch, ok)
if not ok:
conf.env['NSC_ENABLED'] = False

4
waf-tools/pkgconfig.py
View File

@@ -25,7 +25,7 @@ def pkg_check_modules(conf, uselib_name, expression, mandatory=True):
else:
extra_msg = ''
conf.start_msg('pkg-config flags for %s%s' % (uselib_name, extra_msg))
conf.start_msg('Checking for pkg-config flags for %s%s' % (uselib_name, extra_msg))
argv = [pkg_config, '--cflags', '--libs', expression]
cmd = subprocess.Popen(argv, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
@@ -68,7 +68,7 @@ def pkg_check_module_variable(conf, module, variable):
retval = cmd.wait()
out = out.rstrip() # strip the trailing newline
msg_checking = ("pkg-config variable %r in %s" % (variable, module,))
msg_checking = ("Checking for pkg-config variable %r in %s" % (variable, module,))
conf.check_message_custom(msg_checking, '', out)
conf.log.write('%r: %r (exit code %i)\n' % (argv, out, retval))