diff --git a/.waf-tools/boost.py b/.waf-tools/boost.py
index dedb9d8..9b9395e 100644
--- a/.waf-tools/boost.py
+++ b/.waf-tools/boost.py
@@ -13,37 +13,37 @@
 This is an extra tool, not bundled with the default waf binary.
 To add the boost tool to the waf file:
 $ ./waf-light --tools=compat15,boost
-    or, if you have waf >= 1.6.2
+	or, if you have waf >= 1.6.2
 $ ./waf update --files=boost
 
 When using this tool, the wscript will look like:
 
-    def options(opt):
-        opt.load('compiler_cxx boost')
+	def options(opt):
+		opt.load('compiler_cxx boost')
 
-    def configure(conf):
-        conf.load('compiler_cxx boost')
-        conf.check_boost(lib='system filesystem')
+	def configure(conf):
+		conf.load('compiler_cxx boost')
+		conf.check_boost(lib='system filesystem')
 
-    def build(bld):
-        bld(source='main.cpp', target='app', use='BOOST')
+	def build(bld):
+		bld(source='main.cpp', target='app', use='BOOST')
 
 Options are generated, in order to specify the location of boost includes/libraries.
 The `check_boost` configuration function allows to specify the used boost libraries.
-It can also provide default arguments to the --boost-static and --boost-mt command-line arguments.
+It can also provide default arguments to the --boost-mt command-line arguments.
 Everything will be packaged together in a BOOST component that you can use.
 
 When using MSVC, a lot of compilation flags need to match your BOOST build configuration:
  - you may have to add /EHsc to your CXXFLAGS or define boost::throw_exception if BOOST_NO_EXCEPTIONS is defined.
    Errors: C4530
  - boost libraries will try to be smart and use the (pretty but often not useful) auto-linking feature of MSVC
-   So before calling `conf.check_boost` you might want to disabling by adding:
-       conf.env.DEFINES_BOOST += ['BOOST_ALL_NO_LIB']
+   So before calling `conf.check_boost` you might want to disabling by adding
+		conf.env.DEFINES_BOOST += ['BOOST_ALL_NO_LIB']
    Errors:
  - boost might also be compiled with /MT, which links the runtime statically.
    If you have problems with redefined symbols,
-        self.env['DEFINES_%s' % var] += ['BOOST_ALL_NO_LIB']
-        self.env['CXXFLAGS_%s' % var] += ['/MD', '/EHsc']
+		self.env['DEFINES_%s' % var] += ['BOOST_ALL_NO_LIB']
+		self.env['CXXFLAGS_%s' % var] += ['/MD', '/EHsc']
 Passing `--boost-linkage_autodetect` might help ensuring having a correct linkage in some basic cases.
 
 '''
@@ -52,327 +52,467 @@
 import re
 from waflib import Utils, Logs, Errors
 from waflib.Configure import conf
+from waflib.TaskGen import feature, after_method
 
-BOOST_LIBS = ['/usr/lib', '/usr/local/lib', '/opt/local/lib', '/sw/lib', '/lib', '/usr/lib/x86_64-linux-gnu', '/usr/lib/i386-linux-gnu', '/usr/local/ndn/lib']
-BOOST_INCLUDES = ['/usr/include', '/usr/local/include', '/opt/local/include', '/sw/include', '/usr/local/ndn/include']
+BOOST_LIBS = ['/usr/lib/x86_64-linux-gnu', '/usr/lib/i386-linux-gnu',
+			  '/usr/lib', '/usr/local/lib', '/opt/local/lib', '/sw/lib', '/lib']
+BOOST_INCLUDES = ['/usr/include', '/usr/local/include', '/opt/local/include', '/sw/include']
 BOOST_VERSION_FILE = 'boost/version.hpp'
 BOOST_VERSION_CODE = '''
 #include <iostream>
 #include <boost/version.hpp>
 int main() { std::cout << BOOST_LIB_VERSION << ":" << BOOST_VERSION << std::endl; }
 '''
-BOOST_SYSTEM_CODE = '''
+
+BOOST_ERROR_CODE = '''
 #include <boost/system/error_code.hpp>
 int main() { boost::system::error_code c; }
 '''
+
+PTHREAD_CODE = '''
+#include <pthread.h>
+static void* f(void*) { return 0; }
+int main() {
+	pthread_t th;
+	pthread_attr_t attr;
+	pthread_attr_init(&attr);
+	pthread_create(&th, &attr, &f, 0);
+	pthread_join(th, 0);
+	pthread_cleanup_push(0, 0);
+	pthread_cleanup_pop(0);
+	pthread_attr_destroy(&attr);
+}
+'''
+
 BOOST_THREAD_CODE = '''
 #include <boost/thread.hpp>
 int main() { boost::thread t; }
 '''
 
+BOOST_LOG_CODE = '''
+#include <boost/log/trivial.hpp>
+#include <boost/log/utility/setup/console.hpp>
+#include <boost/log/utility/setup/common_attributes.hpp>
+int main() {
+	using namespace boost::log;
+	add_common_attributes();
+	add_console_log(std::clog, keywords::format = "%Message%");
+	BOOST_LOG_TRIVIAL(debug) << "log is working" << std::endl;
+}
+'''
+
 # toolsets from {boost_dir}/tools/build/v2/tools/common.jam
 PLATFORM = Utils.unversioned_sys_platform()
 detect_intel = lambda env: (PLATFORM == 'win32') and 'iw' or 'il'
 detect_clang = lambda env: (PLATFORM == 'darwin') and 'clang-darwin' or 'clang'
 detect_mingw = lambda env: (re.search('MinGW', env.CXX[0])) and 'mgw' or 'gcc'
 BOOST_TOOLSETS = {
-    'borland':  'bcb',
-    'clang':    detect_clang,
-    'como':     'como',
-    'cw':       'cw',
-    'darwin':   'xgcc',
-    'edg':      'edg',
-    'g++':      detect_mingw,
-    'gcc':      detect_mingw,
-    'icpc':     detect_intel,
-    'intel':    detect_intel,
-    'kcc':      'kcc',
-    'kylix':    'bck',
-    'mipspro':  'mp',
-    'mingw':    'mgw',
-    'msvc':     'vc',
-    'qcc':      'qcc',
-    'sun':      'sw',
-    'sunc++':   'sw',
-    'tru64cxx': 'tru',
-    'vacpp':    'xlc'
+	'borland':  'bcb',
+	'clang':	detect_clang,
+	'como':	 'como',
+	'cw':	   'cw',
+	'darwin':   'xgcc',
+	'edg':	  'edg',
+	'g++':	  detect_mingw,
+	'gcc':	  detect_mingw,
+	'icpc':	 detect_intel,
+	'intel':	detect_intel,
+	'kcc':	  'kcc',
+	'kylix':	'bck',
+	'mipspro':  'mp',
+	'mingw':	'mgw',
+	'msvc':	 'vc',
+	'qcc':	  'qcc',
+	'sun':	  'sw',
+	'sunc++':   'sw',
+	'tru64cxx': 'tru',
+	'vacpp':	'xlc'
 }
 
 
 def options(opt):
-    opt = opt.add_option_group('Boost Options')
-
-    opt.add_option('--boost-includes', type='string',
-                   default='', dest='boost_includes',
-                   help='''path to the directory where the boost includes are, e.g., /path/to/boost_1_55_0/stage/include''')
-    opt.add_option('--boost-libs', type='string',
-                   default='', dest='boost_libs',
-                   help='''path to the directory where the boost libs are, e.g., /path/to/boost_1_55_0/stage/lib''')
-    opt.add_option('--boost-static', action='store_true',
-                   default=False, dest='boost_static',
-                   help='link with static boost libraries (.lib/.a)')
-    opt.add_option('--boost-mt', action='store_true',
-                   default=False, dest='boost_mt',
-                   help='select multi-threaded libraries')
-    opt.add_option('--boost-abi', type='string', default='', dest='boost_abi',
-                   help='''select libraries with tags (dgsyp, d for debug), see doc Boost, Getting Started, chapter 6.1''')
-    opt.add_option('--boost-linkage_autodetect', action="store_true", dest='boost_linkage_autodetect',
-                   help="auto-detect boost linkage options (don't get used to it / might break other stuff)")
-    opt.add_option('--boost-toolset', type='string',
-                   default='', dest='boost_toolset',
-                   help='force a toolset e.g. msvc, vc90, gcc, mingw, mgw45 (default: auto)')
-    py_version = '%d%d' % (sys.version_info[0], sys.version_info[1])
-    opt.add_option('--boost-python', type='string',
-                   default=py_version, dest='boost_python',
-                   help='select the lib python with this version (default: %s)' % py_version)
+	opt = opt.add_option_group('Boost Options')
+	opt.add_option('--boost-includes', type='string',
+				   default='', dest='boost_includes',
+				   help='''path to the directory where the boost includes are,
+				   e.g., /path/to/boost_1_55_0/stage/include''')
+	opt.add_option('--boost-libs', type='string',
+				   default='', dest='boost_libs',
+				   help='''path to the directory where the boost libs are,
+				   e.g., path/to/boost_1_55_0/stage/lib''')
+	opt.add_option('--boost-mt', action='store_true',
+				   default=False, dest='boost_mt',
+				   help='select multi-threaded libraries')
+	opt.add_option('--boost-abi', type='string', default='', dest='boost_abi',
+				   help='''select libraries with tags (gd for debug, static is automatically added),
+				   see doc Boost, Getting Started, chapter 6.1''')
+	opt.add_option('--boost-linkage_autodetect', action="store_true", dest='boost_linkage_autodetect',
+				   help="auto-detect boost linkage options (don't get used to it / might break other stuff)")
+	opt.add_option('--boost-toolset', type='string',
+				   default='', dest='boost_toolset',
+				   help='force a toolset e.g. msvc, vc90, \
+						gcc, mingw, mgw45 (default: auto)')
+	py_version = '%d%d' % (sys.version_info[0], sys.version_info[1])
+	opt.add_option('--boost-python', type='string',
+				   default=py_version, dest='boost_python',
+				   help='select the lib python with this version \
+						(default: %s)' % py_version)
 
 
 @conf
 def __boost_get_version_file(self, d):
-    dnode = self.root.find_dir(d)
-    if dnode:
-        return dnode.find_node(BOOST_VERSION_FILE)
-    return None
+	if not d:
+		return None
+	dnode = self.root.find_dir(d)
+	if dnode:
+		return dnode.find_node(BOOST_VERSION_FILE)
+	return None
 
 @conf
 def boost_get_version(self, d):
-    """silently retrieve the boost version number"""
-    node = self.__boost_get_version_file(d)
-    if node:
-        try:
-            txt = node.read()
-        except (OSError, IOError):
-            Logs.error("Could not read the file %r" % node.abspath())
-        else:
-            re_but1 = re.compile('^#define\\s+BOOST_LIB_VERSION\\s+"(.+)"', re.M)
-            m1 = re_but1.search(txt)
-
-            re_but2 = re.compile('^#define\\s+BOOST_VERSION\\s+(\\d+)', re.M)
-            m2 = re_but2.search(txt)
-
-            if m1 and m2:
-                return (m1.group(1), m2.group(1))
-
-    return self.check_cxx(fragment=BOOST_VERSION_CODE, includes=[d], execute=True, define_ret=True).split(":")
+	"""silently retrieve the boost version number"""
+	node = self.__boost_get_version_file(d)
+	if node:
+		try:
+			txt = node.read()
+		except EnvironmentError:
+			Logs.error("Could not read the file %r" % node.abspath())
+		else:
+			re_but1 = re.compile('^#define\\s+BOOST_LIB_VERSION\\s+"(.+)"', re.M)
+			m1 = re_but1.search(txt)
+			re_but2 = re.compile('^#define\\s+BOOST_VERSION\\s+(\\d+)', re.M)
+			m2 = re_but2.search(txt)
+			if m1 and m2:
+				return (m1.group(1), m2.group(1))
+	return self.check_cxx(fragment=BOOST_VERSION_CODE, includes=[d], execute=True, define_ret=True).split(":")
 
 @conf
 def boost_get_includes(self, *k, **kw):
-    includes = k and k[0] or kw.get('includes', None)
-    if includes and self.__boost_get_version_file(includes):
-        return includes
-    for d in Utils.to_list(self.environ.get('INCLUDE', '')) + BOOST_INCLUDES:
-        if self.__boost_get_version_file(d):
-            return d
-    if includes:
-        self.end_msg('headers not found in %s' % includes)
-        self.fatal('The configuration failed')
-    else:
-        self.end_msg('headers not found, please provide a --boost-includes argument (see help)')
-        self.fatal('The configuration failed')
+	includes = k and k[0] or kw.get('includes', None)
+	if includes and self.__boost_get_version_file(includes):
+		return includes
+	for d in self.environ.get('INCLUDE', '').split(';') + BOOST_INCLUDES:
+		if self.__boost_get_version_file(d):
+			return d
+	if includes:
+		self.end_msg('headers not found in %s' % includes)
+		self.fatal('The configuration failed')
+	else:
+		self.end_msg('headers not found, please provide a --boost-includes argument (see help)')
+		self.fatal('The configuration failed')
 
 
 @conf
 def boost_get_toolset(self, cc):
-    toolset = cc
-    if not cc:
-        build_platform = Utils.unversioned_sys_platform()
-        if build_platform in BOOST_TOOLSETS:
-            cc = build_platform
-        else:
-            cc = self.env.CXX_NAME
-    if cc in BOOST_TOOLSETS:
-        toolset = BOOST_TOOLSETS[cc]
-    return isinstance(toolset, str) and toolset or toolset(self.env)
+	toolset = cc
+	if not cc:
+		build_platform = Utils.unversioned_sys_platform()
+		if build_platform in BOOST_TOOLSETS:
+			cc = build_platform
+		else:
+			cc = self.env.CXX_NAME
+	if cc in BOOST_TOOLSETS:
+		toolset = BOOST_TOOLSETS[cc]
+	return isinstance(toolset, str) and toolset or toolset(self.env)
 
 
 @conf
 def __boost_get_libs_path(self, *k, **kw):
-    ''' return the lib path and all the files in it '''
-    if 'files' in kw:
-        return self.root.find_dir('.'), Utils.to_list(kw['files'])
-    libs = k and k[0] or kw.get('libs', None)
-    if libs:
-        path = self.root.find_dir(libs)
-        files = path.ant_glob('*boost_*')
-    if not libs or not files:
-        for d in Utils.to_list(self.environ.get('LIB', [])) + BOOST_LIBS:
-            path = self.root.find_dir(d)
-            if path:
-                files = path.ant_glob('*boost_*')
-                if files:
-                    break
-            path = self.root.find_dir(d + '64')
-            if path:
-                files = path.ant_glob('*boost_*')
-                if files:
-                    break
-    if not path:
-        if libs:
-            self.end_msg('libs not found in %s' % libs)
-            self.fatal('The configuration failed')
-        else:
-            self.end_msg('libs not found, please provide a --boost-libs argument (see help)')
-            self.fatal('The configuration failed')
+	''' return the lib path and all the files in it '''
+	if 'files' in kw:
+		return self.root.find_dir('.'), Utils.to_list(kw['files'])
+	libs = k and k[0] or kw.get('libs', None)
+	if libs:
+		path = self.root.find_dir(libs)
+		files = path.ant_glob('*boost_*')
+	if not libs or not files:
+		for d in self.environ.get('LIB', '').split(';') + BOOST_LIBS:
+			if not d:
+				continue
+			path = self.root.find_dir(d)
+			if path:
+				files = path.ant_glob('*boost_*')
+				if files:
+					break
+			path = self.root.find_dir(d + '64')
+			if path:
+				files = path.ant_glob('*boost_*')
+				if files:
+					break
+	if not path:
+		if libs:
+			self.end_msg('libs not found in %s' % libs)
+			self.fatal('The configuration failed')
+		else:
+			self.end_msg('libs not found, please provide a --boost-libs argument (see help)')
+			self.fatal('The configuration failed')
 
-    self.to_log('Found the boost path in %r with the libraries:' % path)
-    for x in files:
-        self.to_log('    %r' % x)
-    return path, files
+	self.to_log('Found the boost path in %r with the libraries:' % path)
+	for x in files:
+		self.to_log('    %r' % x)
+	return path, files
 
 @conf
 def boost_get_libs(self, *k, **kw):
+	'''
+	return the lib path and the required libs
+	according to the parameters
+	'''
+	path, files = self.__boost_get_libs_path(**kw)
+	files = sorted(files, key=lambda f: (len(f.name), f.name), reverse=True)
+	toolset = self.boost_get_toolset(kw.get('toolset', ''))
+	toolset_pat = '(-%s[0-9]{0,3})' % toolset
+	version = '-%s' % self.env.BOOST_VERSION
+
+	def find_lib(re_lib, files):
+		for file in files:
+			if re_lib.search(file.name):
+				self.to_log('Found boost lib %s' % file)
+				return file
+		return None
+
+	def format_lib_name(name):
+		if name.startswith('lib') and self.env.CC_NAME != 'msvc':
+			name = name[3:]
+		return name[:name.rfind('.')]
+
+	def match_libs(lib_names, is_static):
+		libs = []
+		lib_names = Utils.to_list(lib_names)
+		if not lib_names:
+			return libs
+		t = []
+		if kw.get('mt', False):
+			t.append('-mt')
+		if kw.get('abi', None):
+			t.append('%s%s' % (is_static and '-s' or '-', kw['abi']))
+		elif is_static:
+			t.append('-s')
+		tags_pat = t and ''.join(t) or ''
+		ext = is_static and self.env.cxxstlib_PATTERN or self.env.cxxshlib_PATTERN
+		ext = ext.partition('%s')[2] # remove '%s' or 'lib%s' from PATTERN
+
+		for lib in lib_names:
+			if lib == 'python':
+				# for instance, with python='27',
+				# accepts '-py27', '-py2', '27' and '2'
+				# but will reject '-py3', '-py26', '26' and '3'
+				tags = '({0})?((-py{2})|(-py{1}(?=[^0-9]))|({2})|({1}(?=[^0-9]))|(?=[^0-9])(?!-py))'.format(tags_pat, kw['python'][0], kw['python'])
+			else:
+				tags = tags_pat
+			# Trying libraries, from most strict match to least one
+			for pattern in ['boost_%s%s%s%s%s$' % (lib, toolset_pat, tags, version, ext),
+							'boost_%s%s%s%s$' % (lib, tags, version, ext),
+							# Give up trying to find the right version
+							'boost_%s%s%s%s$' % (lib, toolset_pat, tags, ext),
+							'boost_%s%s%s$' % (lib, tags, ext),
+							'boost_%s%s$' % (lib, ext),
+							'boost_%s' % lib]:
+				self.to_log('Trying pattern %s' % pattern)
+				file = find_lib(re.compile(pattern), files)
+				if file:
+					libs.append(format_lib_name(file.name))
+					break
+			else:
+				self.end_msg('lib %s not found in %s' % (lib, path.abspath()))
+				self.fatal('The configuration failed')
+		return libs
+
+	return  path.abspath(), match_libs(kw.get('lib', None), False), match_libs(kw.get('stlib', None), True)
+
+@conf
+def _check_pthread_flag(self, *k, **kw):
+	'''
+	Computes which flags should be added to CXXFLAGS and LINKFLAGS to compile in multi-threading mode
+
+	Yes, we *need* to put the -pthread thing in CPPFLAGS because with GCC3,
+	boost/thread.hpp will trigger a #error if -pthread isn't used:
+	  boost/config/requires_threads.hpp:47:5: #error "Compiler threading support
+	  is not turned on. Please set the correct command line options for
+	  threading: -pthread (Linux), -pthreads (Solaris) or -mthreads (Mingw32)"
+
+	Based on _BOOST_PTHREAD_FLAG(): https://github.com/tsuna/boost.m4/blob/master/build-aux/boost.m4
     '''
-    return the lib path and the required libs
-    according to the parameters
-    '''
-    path, files = self.__boost_get_libs_path(**kw)
-    t = []
-    if kw.get('mt', False):
-        t.append('mt')
-    if kw.get('abi', None):
-        t.append(kw['abi'])
-    tags = t and '(-%s)+' % '-'.join(t) or ''
-    toolset = self.boost_get_toolset(kw.get('toolset', ''))
-    toolset_pat = '(-%s[0-9]{0,3})+' % toolset
-    version = '(-%s)+' % self.env.BOOST_VERSION
 
-    def find_lib(re_lib, files):
-        for file in files:
-            if re_lib.search(file.name):
-                self.to_log('Found boost lib %s' % file)
-                return file
-        return None
+	var = kw.get('uselib_store', 'BOOST')
 
-    def format_lib_name(name):
-        if name.startswith('lib') and self.env.CC_NAME != 'msvc':
-            name = name[3:]
-        return name[:name.rfind('.')]
+	self.start_msg('Checking the flags needed to use pthreads')
 
-    libs = []
-    for lib in Utils.to_list(k and k[0] or kw.get('lib', None)):
-        py = (lib == 'python') and '(-py%s)+' % kw['python'] or ''
-        # Trying libraries, from most strict match to least one
-        for pattern in ['boost_%s%s%s%s%s' % (lib, toolset_pat, tags, py, version),
-                        'boost_%s%s%s%s' % (lib, tags, py, version),
-                        'boost_%s%s%s' % (lib, tags, version),
-                        # Give up trying to find the right version
-                        'boost_%s%s%s%s' % (lib, toolset_pat, tags, py),
-                        'boost_%s%s%s' % (lib, tags, py),
-                        'boost_%s%s' % (lib, tags)]:
-            self.to_log('Trying pattern %s' % pattern)
-            file = find_lib(re.compile(pattern), files)
-            if file:
-                libs.append(format_lib_name(file.name))
-                break
-        else:
-            self.end_msg('lib %s not found in %s' % (lib, path.abspath()))
-            self.fatal('The configuration failed')
+	# The ordering *is* (sometimes) important.  Some notes on the
+	# individual items follow:
+	# (none): in case threads are in libc; should be tried before -Kthread and
+	#       other compiler flags to prevent continual compiler warnings
+	# -lpthreads: AIX (must check this before -lpthread)
+	# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+	# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+	# -llthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+	# -pthread: GNU Linux/GCC (kernel threads), BSD/GCC (userland threads)
+	# -pthreads: Solaris/GCC
+	# -mthreads: MinGW32/GCC, Lynx/GCC
+	# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+	#      doesn't hurt to check since this sometimes defines pthreads too;
+	#      also defines -D_REENTRANT)
+	#      ... -mt is also the pthreads flag for HP/aCC
+	# -lpthread: GNU Linux, etc.
+	# --thread-safe: KAI C++
+	if Utils.unversioned_sys_platform() == "sunos":
+		# On Solaris (at least, for some versions), libc contains stubbed
+		# (non-functional) versions of the pthreads routines, so link-based
+		# tests will erroneously succeed.  (We need to link with -pthreads/-mt/
+		# -lpthread.)  (The stubs are missing pthread_cleanup_push, or rather
+		# a function called by this macro, so we could check for that, but
+		# who knows whether they'll stub that too in a future libc.)  So,
+		# we'll just look for -pthreads and -lpthread first:
+		boost_pthread_flags = ["-pthreads", "-lpthread", "-mt", "-pthread"]
+	else:
+		boost_pthread_flags = ["", "-lpthreads", "-Kthread", "-kthread", "-llthread", "-pthread",
+							   "-pthreads", "-mthreads", "-lpthread", "--thread-safe", "-mt"]
 
-    return path.abspath(), libs
+	for boost_pthread_flag in boost_pthread_flags:
+		try:
+			self.env.stash()
+			self.env['CXXFLAGS_%s' % var] += [boost_pthread_flag]
+			self.env['LINKFLAGS_%s' % var] += [boost_pthread_flag]
+			self.check_cxx(code=PTHREAD_CODE, msg=None, use=var, execute=False)
 
+			self.end_msg(boost_pthread_flag)
+			return
+		except self.errors.ConfigurationError:
+			self.env.revert()
+	self.end_msg('None')
 
 @conf
 def check_boost(self, *k, **kw):
-    """
-    Initialize boost libraries to be used.
+	"""
+	Initialize boost libraries to be used.
 
-    Keywords: you can pass the same parameters as with the command line (without "--boost-").
-    Note that the command line has the priority, and should preferably be used.
-    """
-    if not self.env['CXX']:
-        self.fatal('load a c++ compiler first, conf.load("compiler_cxx")')
+	Keywords: you can pass the same parameters as with the command line (without "--boost-").
+	Note that the command line has the priority, and should preferably be used.
+	"""
+	if not self.env['CXX']:
+		self.fatal('load a c++ compiler first, conf.load("compiler_cxx")')
 
-    params = {'lib': k and k[0] or kw.get('lib', None)}
-    for key, value in self.options.__dict__.items():
-        if not key.startswith('boost_'):
-            continue
-        key = key[len('boost_'):]
-        params[key] = value and value or kw.get(key, '')
+	params = {
+		'lib': k and k[0] or kw.get('lib', None),
+		'stlib': kw.get('stlib', None)
+	}
+	for key, value in self.options.__dict__.items():
+		if not key.startswith('boost_'):
+			continue
+		key = key[len('boost_'):]
+		params[key] = value and value or kw.get(key, '')
 
-    var = kw.get('uselib_store', 'BOOST')
+	var = kw.get('uselib_store', 'BOOST')
 
-    self.start_msg('Checking boost includes')
-    self.env['INCLUDES_%s' % var] = inc = self.boost_get_includes(**params)
-    versions = self.boost_get_version(inc)
-    self.env.BOOST_VERSION = versions[0]
-    self.env.BOOST_VERSION_NUMBER = int(versions[1])
-    self.end_msg("%d.%d.%d" % (int(versions[1]) / 100000,
-                   int(versions[1]) / 100 % 1000,
-                   int(versions[1]) % 100))
-    if Logs.verbose:
-        Logs.pprint('CYAN', '    path : %s' % self.env['INCLUDES_%s' % var])
+	self.start_msg('Checking boost includes')
+	self.env['INCLUDES_%s' % var] = inc = self.boost_get_includes(**params)
+	versions = self.boost_get_version(inc)
+	self.env.BOOST_VERSION = versions[0]
+	self.env.BOOST_VERSION_NUMBER = int(versions[1])
+	self.end_msg("%d.%d.%d" % (int(versions[1]) / 100000,
+							   int(versions[1]) / 100 % 1000,
+							   int(versions[1]) % 100))
+	if Logs.verbose:
+		Logs.pprint('CYAN', '	path : %s' % self.env['INCLUDES_%s' % var])
 
-    if not params['lib']:
-        return
-    self.start_msg('Checking boost libs')
-    suffix = params.get('static', None) and 'ST' or ''
-    path, libs = self.boost_get_libs(**params)
-    self.env['%sLIBPATH_%s' % (suffix, var)] = [path]
-    self.env['%sLIB_%s' % (suffix, var)] = libs
-    self.end_msg('ok')
-    if Logs.verbose:
-        Logs.pprint('CYAN', '    path : %s' % path)
-        Logs.pprint('CYAN', '    libs : %s' % libs)
+	if not params['lib'] and not params['stlib']:
+		return
+	if 'static' in kw or 'static' in params:
+		Logs.warn('boost: static parameter is deprecated, use stlib instead.')
+	self.start_msg('Checking boost libs')
+	path, libs, stlibs = self.boost_get_libs(**params)
+	self.env['LIBPATH_%s' % var] = [path]
+	self.env['STLIBPATH_%s' % var] = [path]
+	self.env['LIB_%s' % var] = libs
+	self.env['STLIB_%s' % var] = stlibs
+	self.end_msg('ok')
+	if Logs.verbose:
+		Logs.pprint('CYAN', '	path : %s' % path)
+		Logs.pprint('CYAN', '	shared libs : %s' % libs)
+		Logs.pprint('CYAN', '	static libs : %s' % stlibs)
+
+	def has_shlib(lib):
+		return params['lib'] and lib in params['lib']
+	def has_stlib(lib):
+		return params['stlib'] and lib in params['stlib']
+	def has_lib(lib):
+		return has_shlib(lib) or has_stlib(lib)
+	if has_lib('thread'):
+		# not inside try_link to make check visible in the output
+		self._check_pthread_flag(k, kw)
+
+	def try_link():
+		if has_lib('system'):
+			self.check_cxx(fragment=BOOST_ERROR_CODE, use=var, execute=False)
+		if has_lib('thread'):
+			self.check_cxx(fragment=BOOST_THREAD_CODE, use=var, execute=False)
+		if has_lib('log'):
+			if not has_lib('thread'):
+				self.env['DEFINES_%s' % var] += ['BOOST_LOG_NO_THREADS']
+			if has_shlib('log'):
+				self.env['DEFINES_%s' % var] += ['BOOST_LOG_DYN_LINK']
+			self.check_cxx(fragment=BOOST_LOG_CODE, use=var, execute=False)
+
+	if params.get('linkage_autodetect', False):
+		self.start_msg("Attempting to detect boost linkage flags")
+		toolset = self.boost_get_toolset(kw.get('toolset', ''))
+		if toolset in ('vc',):
+			# disable auto-linking feature, causing error LNK1181
+			# because the code wants to be linked against
+			self.env['DEFINES_%s' % var] += ['BOOST_ALL_NO_LIB']
+
+			# if no dlls are present, we guess the .lib files are not stubs
+			has_dlls = False
+			for x in Utils.listdir(path):
+				if x.endswith(self.env.cxxshlib_PATTERN % ''):
+					has_dlls = True
+					break
+			if not has_dlls:
+				self.env['STLIBPATH_%s' % var] = [path]
+				self.env['STLIB_%s' % var] = libs
+				del self.env['LIB_%s' % var]
+				del self.env['LIBPATH_%s' % var]
+
+			# we attempt to play with some known-to-work CXXFLAGS combinations
+			for cxxflags in (['/MD', '/EHsc'], []):
+				self.env.stash()
+				self.env["CXXFLAGS_%s" % var] += cxxflags
+				try:
+					try_link()
+					self.end_msg("ok: winning cxxflags combination: %s" % (self.env["CXXFLAGS_%s" % var]))
+					exc = None
+					break
+				except Errors.ConfigurationError as e:
+					self.env.revert()
+					exc = e
+
+			if exc is not None:
+				self.end_msg("Could not auto-detect boost linking flags combination, you may report it to boost.py author", ex=exc)
+				self.fatal('The configuration failed')
+		else:
+			self.end_msg("Boost linkage flags auto-detection not implemented (needed ?) for this toolchain")
+			self.fatal('The configuration failed')
+	else:
+		self.start_msg('Checking for boost linkage')
+		try:
+			try_link()
+		except Errors.ConfigurationError as e:
+			self.end_msg("Could not link against boost libraries using supplied options")
+			self.fatal('The configuration failed')
+		self.end_msg('ok')
 
 
-    def try_link():
-        if 'system' in params['lib']:
-            self.check_cxx(
-             fragment=BOOST_SYSTEM_CODE,
-             use=var,
-             execute=False,
-            )
-        if 'thread' in params['lib']:
-            self.check_cxx(
-             fragment=BOOST_THREAD_CODE,
-             use=var,
-             execute=False,
-            )
-
-    if params.get('linkage_autodetect', False):
-        self.start_msg("Attempting to detect boost linkage flags")
-        toolset = self.boost_get_toolset(kw.get('toolset', ''))
-        if toolset in ['vc']:
-            # disable auto-linking feature, causing error LNK1181
-            # because the code wants to be linked against
-            self.env['DEFINES_%s' % var] += ['BOOST_ALL_NO_LIB']
-
-            # if no dlls are present, we guess the .lib files are not stubs
-            has_dlls = False
-            for x in Utils.listdir(path):
-                if x.endswith(self.env.cxxshlib_PATTERN % ''):
-                    has_dlls = True
-                    break
-            if not has_dlls:
-                self.env['STLIBPATH_%s' % var] = [path]
-                self.env['STLIB_%s' % var] = libs
-                del self.env['LIB_%s' % var]
-                del self.env['LIBPATH_%s' % var]
-
-            # we attempt to play with some known-to-work CXXFLAGS combinations
-            for cxxflags in (['/MD', '/EHsc'], []):
-                self.env.stash()
-                self.env["CXXFLAGS_%s" % var] += cxxflags
-                try:
-                    try_link()
-                    self.end_msg("ok: winning cxxflags combination: %s" % (self.env["CXXFLAGS_%s" % var]))
-                    e = None
-                    break
-                except Errors.ConfigurationError as exc:
-                    self.env.revert()
-                    e = exc
-
-            if e is not None:
-                self.end_msg("Could not auto-detect boost linking flags combination, you may report it to boost.py author", ex=e)
-                self.fatal('The configuration failed')
-        else:
-            self.end_msg("Boost linkage flags auto-detection not implemented (needed ?) for this toolchain")
-            self.fatal('The configuration failed')
-    else:
-        self.start_msg('Checking for boost linkage')
-        try:
-            try_link()
-        except Errors.ConfigurationError as e:
-            self.end_msg("Could not link against boost libraries using supplied options")
-            self.fatal('The configuration failed')
-        self.end_msg('ok')
+@feature('cxx')
+@after_method('apply_link')
+def install_boost(self):
+	if install_boost.done or not Utils.is_win32 or not self.bld.cmd.startswith('install'):
+		return
+	install_boost.done = True
+	inst_to = getattr(self, 'install_path', '${BINDIR}')
+	for lib in self.env.LIB_BOOST:
+		try:
+			file = self.bld.find_file(self.env.cxxshlib_PATTERN % lib, self.env.LIBPATH_BOOST)
+			self.bld.install_files(inst_to, self.bld.root.find_node(file))
+		except:
+			continue
+install_boost.done = False
diff --git a/.waf-tools/coverage.py b/.waf-tools/coverage.py
index ce92883..cc58165 100644
--- a/.waf-tools/coverage.py
+++ b/.waf-tools/coverage.py
@@ -1,15 +1,15 @@
 # -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
-from waflib import TaskGen, Logs
+from waflib import TaskGen
 
 def options(opt):
-    opt.add_option('--with-coverage', action='store_true', default=False, dest='with_coverage',
-                   help='''Set compiler flags for gcc to enable code coverage information''')
+    opt.add_option('--with-coverage', action='store_true', default=False,
+                   help='Add compiler flags to enable code coverage information')
 
 def configure(conf):
     if conf.options.with_coverage:
         if not conf.options.debug:
-            conf.fatal("Code coverage flags require debug mode compilation (add --debug)")
+            conf.fatal('Code coverage flags require debug mode compilation (add --debug)')
         conf.check_cxx(cxxflags=['-fprofile-arcs', '-ftest-coverage', '-fPIC'],
                        linkflags=['-fprofile-arcs'], uselib_store='GCOV', mandatory=True)
 
diff --git a/.waf-tools/default-compiler-flags.py b/.waf-tools/default-compiler-flags.py
index bba2b1e..54db7ea 100644
--- a/.waf-tools/default-compiler-flags.py
+++ b/.waf-tools/default-compiler-flags.py
@@ -1,16 +1,17 @@
 # -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 
-from waflib import Logs, Configure, Utils
+from waflib import Configure, Logs, Utils
 
 def options(opt):
-    opt.add_option('--debug', '--with-debug', action='store_true', default=False, dest='debug',
-                   help='''Compile in debugging mode with minimal optimizations (-O0 or -Og)''')
+    opt.add_option('--debug', '--with-debug', action='store_true', default=False,
+                   help='Compile in debugging mode with minimal optimizations (-O0 or -Og)')
 
 def configure(conf):
     conf.start_msg('Checking C++ compiler version')
 
-    cxx = conf.env['CXX_NAME'] # CXX_NAME is the generic name of the compiler
-    ccver = tuple(int(i) for i in conf.env['CC_VERSION'])
+    cxx = conf.env.CXX_NAME # generic name of the compiler
+    ccver = tuple(int(i) for i in conf.env.CC_VERSION)
+    ccverstr = '.'.join(conf.env.CC_VERSION)
     errmsg = ''
     warnmsg = ''
     if cxx == 'gcc':
@@ -28,13 +29,13 @@
         conf.flags = CompilerFlags()
 
     if errmsg:
-        conf.end_msg('.'.join(conf.env['CC_VERSION']), color='RED')
+        conf.end_msg(ccverstr, color='RED')
         conf.fatal(errmsg)
     elif warnmsg:
-        conf.end_msg('.'.join(conf.env['CC_VERSION']), color='YELLOW')
+        conf.end_msg(ccverstr, color='YELLOW')
         Logs.warn(warnmsg)
     else:
-        conf.end_msg('.'.join(conf.env['CC_VERSION']))
+        conf.end_msg(ccverstr)
 
     conf.areCustomCxxflagsPresent = (len(conf.env.CXXFLAGS) > 0)
 
@@ -53,10 +54,10 @@
         extraFlags = conf.flags.getDebugFlags(conf)
         if conf.areCustomCxxflagsPresent:
             missingFlags = [x for x in extraFlags['CXXFLAGS'] if x not in conf.env.CXXFLAGS]
-            if len(missingFlags) > 0:
-                Logs.warn("Selected debug mode, but CXXFLAGS is set to a custom value '%s'"
-                          % " ".join(conf.env.CXXFLAGS))
-                Logs.warn("Default flags '%s' are not activated" % " ".join(missingFlags))
+            if missingFlags:
+                Logs.warn('Selected debug mode, but CXXFLAGS is set to a custom value "%s"'
+                          % ' '.join(conf.env.CXXFLAGS))
+                Logs.warn('Default flags "%s" will not be used' % ' '.join(missingFlags))
     else:
         extraFlags = conf.flags.getOptimizedFlags(conf)
 
@@ -106,6 +107,9 @@
 
 
 class CompilerFlags(object):
+    def getCompilerVersion(self, conf):
+        return tuple(int(i) for i in conf.env.CC_VERSION)
+
     def getGeneralFlags(self, conf):
         """Get dict of CXXFLAGS, LINKFLAGS, and DEFINES that are always needed"""
         return {'CXXFLAGS': [], 'LINKFLAGS': [], 'DEFINES': []}
@@ -160,16 +164,14 @@
 class GccFlags(GccBasicFlags):
     def getDebugFlags(self, conf):
         flags = super(GccFlags, self).getDebugFlags(conf)
-        version = tuple(int(i) for i in conf.env['CC_VERSION'])
-        if version < (5, 1, 0):
+        if self.getCompilerVersion(conf) < (5, 1, 0):
             flags['CXXFLAGS'] += ['-Wno-missing-field-initializers']
         flags['CXXFLAGS'] += ['-fdiagnostics-color'] # gcc >= 4.9
         return flags
 
     def getOptimizedFlags(self, conf):
         flags = super(GccFlags, self).getOptimizedFlags(conf)
-        version = tuple(int(i) for i in conf.env['CC_VERSION'])
-        if version < (5, 1, 0):
+        if self.getCompilerVersion(conf) < (5, 1, 0):
             flags['CXXFLAGS'] += ['-Wno-missing-field-initializers']
         flags['CXXFLAGS'] += ['-fdiagnostics-color'] # gcc >= 4.9
         return flags
@@ -177,8 +179,8 @@
 class ClangFlags(GccBasicFlags):
     def getGeneralFlags(self, conf):
         flags = super(ClangFlags, self).getGeneralFlags(conf)
-        version = tuple(int(i) for i in conf.env['CC_VERSION'])
-        if Utils.unversioned_sys_platform() == 'darwin' and version >= (9, 0, 0): # Bug #4296
+        if Utils.unversioned_sys_platform() == 'darwin' and self.getCompilerVersion(conf) >= (9, 0, 0):
+            # Bug #4296
             flags['CXXFLAGS'] += [['-isystem', '/usr/local/include'], # for Homebrew
                                   ['-isystem', '/opt/local/include']] # for MacPorts
         return flags
@@ -194,7 +196,7 @@
                               '-Wno-error=unneeded-internal-declaration', # Bug #1588
                               '-Wno-unused-local-typedef', # Bugs #2657 and #3209
                               ]
-        version = tuple(int(i) for i in conf.env['CC_VERSION'])
+        version = self.getCompilerVersion(conf)
         if version < (3, 9, 0) or (Utils.unversioned_sys_platform() == 'darwin' and version < (8, 1, 0)):
             flags['CXXFLAGS'] += ['-Wno-unknown-pragmas']
         return flags
@@ -206,7 +208,7 @@
                               '-Wundefined-func-template',
                               '-Wno-unused-local-typedef', # Bugs #2657 and #3209
                               ]
-        version = tuple(int(i) for i in conf.env['CC_VERSION'])
+        version = self.getCompilerVersion(conf)
         if version < (3, 9, 0) or (Utils.unversioned_sys_platform() == 'darwin' and version < (8, 1, 0)):
             flags['CXXFLAGS'] += ['-Wno-unknown-pragmas']
         return flags
diff --git a/manpages/ndn-dissect.rst b/manpages/ndn-dissect.rst
index be92682..552cde5 100644
--- a/manpages/ndn-dissect.rst
+++ b/manpages/ndn-dissect.rst
@@ -6,7 +6,7 @@
 
 ::
 
-    ndn-dissect [-hV] [input-file]
+    ndn-dissect [-hV] [INPUT-FILE]
 
 Description
 -----------
@@ -18,15 +18,18 @@
 Options
 -------
 
-``-h``
+.. option:: -h
+
   Print help and exit.
 
-``-V``
+.. option:: -V
+
   Print version and exit.
 
-``input-file``
+.. option:: INPUT-FILE
+
   The file to read packets from.
-  If no :option:`input-file` is given, the standard input is used.
+  If no :option:`INPUT-FILE` is given, the standard input is used.
 
 Examples
 --------
diff --git a/manpages/ndndump.rst b/manpages/ndndump.rst
index 0872b38..65d1ea1 100644
--- a/manpages/ndndump.rst
+++ b/manpages/ndndump.rst
@@ -6,7 +6,7 @@
 
 ::
 
-    ndndump [-hV] [-i interface] [-r file] [-f filter] [expression]
+    ndndump [-hV] [-i INTERFACE] [-r FILE] [-f FILTER] [EXPRESSION]
 
 Description
 -----------
@@ -25,29 +25,36 @@
 Options
 -------
 
-``-h``
-  Print help and exit.
+.. option:: -h
 
-``-V``
-  Print version and exit.
+    Print help and exit.
 
-``-i``
-  Listen on :option:`interface`.
-  If unspecified, ndndump searches the system interface list for the lowest numbered,
-  configured up interface (excluding loopback).
+.. option:: -V
 
-``-r``
-  Read packets from :option:`file` (which was created with :manpage:`tcpdump(8)` using its -w option).
+    Print version and exit.
 
-``-v``
-  Produce verbose output.
+.. option:: -i INTERFACE
 
-``-f``
-  Print a packet only if its Name matches the regular expression :option:`filter`.
+    Listen on the specified interface.
+    If unspecified, ndndump searches the system interface list for the lowest numbered,
+    configured up interface (excluding loopback).
 
-``expression``
-  Selects which packets will be analyzed, in :manpage:`pcap-filter(7)` format.
-  If no :option:`expression` is given, a default expression is implied which can be seen with ``-h`` option.
+.. option:: -r FILE
+
+    Read packets from the specified file (which was created with :manpage:`tcpdump(8)` using its ``-w`` option).
+
+.. option:: -v
+
+    Produce verbose output.
+
+.. option:: -f FILTER
+
+    Print a packet only if its Name matches the regular expression ``FILTER``.
+
+.. option:: EXPRESSION
+
+    Selects which packets will be analyzed, in :manpage:`pcap-filter(7)` format.
+    If no :option:`EXPRESSION` is given, a default expression is implied which can be seen with ``-h`` option.
 
 Examples
 --------
diff --git a/tests/wscript b/tests/wscript
index 4f7301f..750f82d 100644
--- a/tests/wscript
+++ b/tests/wscript
@@ -5,10 +5,11 @@
     if not bld.env['WITH_TESTS']:
         return
 
-    bld(target='../unit-tests',
-        features='cxx cxxprogram',
+    tmp_path = 'TMP_TESTS_PATH="%s"' % bld.bldnode.make_node('tmp-files')
+    bld.program(
+        target='../unit-tests',
+        name='unit-tests',
         source=bld.path.ant_glob(['*.cpp'] + ['%s/**/*.cpp' % tool for tool in bld.env['BUILD_TOOLS']]),
         use=['core-objects'] + ['%s-objects' % tool for tool in bld.env['BUILD_TOOLS']],
-        headers='../common.hpp boost-test.hpp',
         install_path=None,
-        defines='TMP_TESTS_PATH=\"%s/tmp-tests\"' % bld.bldnode)
+        defines=[tmp_path])
diff --git a/tools/chunks/wscript b/tools/chunks/wscript
index 56ff392..31f92f3 100644
--- a/tools/chunks/wscript
+++ b/tools/chunks/wscript
@@ -3,28 +3,30 @@
 
 def build(bld):
 
-    bld(features='cxx',
-        name='ndncatchunks-objects',
+    bld.objects(
+        target='ndncatchunks-objects',
         source=bld.path.ant_glob('catchunks/*.cpp', excl='catchunks/ndncatchunks.cpp'),
         use='core-objects')
 
-    bld(features='cxx cxxprogram',
+    bld.program(
         target='../../bin/ndncatchunks',
+        name='ndncatchunks',
         source='catchunks/ndncatchunks.cpp',
         use='ndncatchunks-objects')
 
-    bld(features='cxx',
-        name='ndnputchunks-objects',
+    bld.objects(
+        target='ndnputchunks-objects',
         source=bld.path.ant_glob('putchunks/*.cpp', excl='putchunks/ndnputchunks.cpp'),
         use='core-objects')
 
-    bld(features='cxx cxxprogram',
+    bld.program(
         target='../../bin/ndnputchunks',
+        name='ndnputchunks',
         source='putchunks/ndnputchunks.cpp',
         use='ndnputchunks-objects')
 
     ## (for unit tests)
 
-    bld(name='chunks-objects',
+    bld(target='chunks-objects',
         use='ndncatchunks-objects ndnputchunks-objects')
 
diff --git a/tools/dissect/wscript b/tools/dissect/wscript
index 373f6a4..80c6375 100644
--- a/tools/dissect/wscript
+++ b/tools/dissect/wscript
@@ -2,14 +2,13 @@
 top = '../..'
 
 def build(bld):
-    bld(features='cxx',
-        name='dissect-objects',
+    bld.objects(
+        target='dissect-objects',
         source=bld.path.ant_glob('*.cpp', excl='main.cpp'),
-        includes='.',
-        export_includes='.',
         use='core-objects')
 
-    bld(features='cxx cxxprogram',
+    bld.program(
         target='../../bin/ndn-dissect',
+        name='ndn-dissect',
         source='main.cpp',
         use='dissect-objects')
diff --git a/tools/dump/wscript b/tools/dump/wscript
index 946b296..f489d24 100644
--- a/tools/dump/wscript
+++ b/tools/dump/wscript
@@ -20,27 +20,26 @@
 '''
 
 def configure(conf):
-    conf.check(header_name="inttypes.h", mandatory=False)
-    conf.check(header_name="stdint.h", mandatory=False)
-    conf.check(header_name="sys/bitypes.h", mandatory=False)
-    conf.check(fragment=ATTRIBUTE_CHECK, msg="Checking for __attribute__", mandatory=False)
+    conf.check(header_name='inttypes.h', mandatory=False)
+    conf.check(header_name='stdint.h', mandatory=False)
+    conf.check(header_name='sys/bitypes.h', mandatory=False)
+    conf.check(fragment=ATTRIBUTE_CHECK, msg='Checking for __attribute__', mandatory=False)
 
-    conf.check(header_name=["sys/types.h", "sys/time.h", "time.h"],
-               define="TIME_WITH_SYS_TIME", mandatory=False)
+    conf.check(header_name=['sys/types.h', 'sys/time.h', 'time.h'],
+               define='TIME_WITH_SYS_TIME', mandatory=False)
 
     conf.check_cfg(path='pcap-config',
-                   package="libpcap", args=['--libs', '--cflags'],
+                   package='libpcap', args=['--libs', '--cflags'],
                    uselib_store='PCAP', mandatory=True)
 
 def build(bld):
-    bld(features='cxx',
-        name='dump-objects',
+    bld.objects(
+        target='dump-objects',
         source=bld.path.ant_glob('*.cpp', excl='main.cpp'),
-        includes='.',
-        export_includes='.',
-        use='core-objects BOOST PCAP')
+        use='core-objects PCAP')
 
-    bld(features='cxx cxxprogram',
+    bld.program(
         target='../../bin/ndndump',
+        name='ndndump',
         source='main.cpp',
         use='dump-objects')
diff --git a/tools/peek/wscript b/tools/peek/wscript
index b719c8b..fa657a0 100644
--- a/tools/peek/wscript
+++ b/tools/peek/wscript
@@ -20,5 +20,5 @@
 
     ## (for unit tests)
 
-    bld(name='peek-objects',
+    bld(target='peek-objects',
         use='ndnpeek-objects')
diff --git a/tools/ping/wscript b/tools/ping/wscript
index 3e6755d..f0c5f5e 100644
--- a/tools/ping/wscript
+++ b/tools/ping/wscript
@@ -3,27 +3,29 @@
 
 def build(bld):
 
-    bld(features='cxx',
-        name='ping-client-objects',
+    bld.objects(
+        target='ping-client-objects',
         source=bld.path.ant_glob('client/*.cpp', excl='client/ndn-ping.cpp'),
         use='core-objects')
 
-    bld(features='cxx cxxprogram',
+    bld.program(
         target='../../bin/ndnping',
+        name='ndnping',
         source='client/ndn-ping.cpp',
         use='ping-client-objects')
 
-    bld(features='cxx',
-        name='ping-server-objects',
+    bld.objects(
+        target='ping-server-objects',
         source=bld.path.ant_glob('server/*.cpp', excl='server/ndn-ping-server.cpp'),
         use='core-objects')
 
-    bld(features='cxx cxxprogram',
+    bld.program(
         target='../../bin/ndnpingserver',
+        name='ndnpingserver',
         source='server/ndn-ping-server.cpp',
         use='ping-server-objects')
 
     ## (for unit tests)
 
-    bld(name='ping-objects',
+    bld(target='ping-objects',
         use='ping-client-objects ping-server-objects')
diff --git a/tools/wscript b/tools/wscript
index 00a0fdf..9c46966 100644
--- a/tools/wscript
+++ b/tools/wscript
@@ -1,7 +1,7 @@
 # -*- Mode: python; py-indent-offset: 4; indent-tabs-mode: nil; coding: utf-8; -*-
 top = '..'
 
-from waflib import Options, Errors
+from waflib import Options
 
 def options(opt):
     for subdir in opt.path.ant_glob(['*'], dir=True, src=False):
@@ -21,15 +21,15 @@
 
     Options.options.disable_pib = True
 
-    for subdir in conf.path.ant_glob(['*'], dir=True, src=False):
-        tool = str(subdir.path_from(conf.path))
+    for subdir in conf.path.ant_glob('*', dir=True, src=False):
+        tool = subdir.path_from(conf.path)
         all_tools.add(tool)
 
         is_enabled = getattr(Options.options, 'enable_%s' % tool)
         is_disabled = getattr(Options.options, 'disable_%s' % tool)
 
         if is_enabled and is_disabled:
-            raise Errors.WafError("--enable-%s and --disable-%s cannot be both specified" % (tool, tool))
+            conf.fatal("--enable-%s and --disable-%s cannot be both specified" % (tool, tool))
 
         if is_enabled:
             enabled_tools.add(tool)
diff --git a/wscript b/wscript
index 47723b2..5e8f5d5 100644
--- a/wscript
+++ b/wscript
@@ -5,7 +5,7 @@
 GIT_TAG_PREFIX = 'ndn-tools-'
 
 from waflib import Utils, Context
-import os
+import os, subprocess
 
 def options(opt):
     opt.load(['compiler_cxx', 'gnu_dirs'])
@@ -27,12 +27,12 @@
     conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'],
                    uselib_store='NDN_CXX', mandatory=True)
 
-    boost_libs = 'program_options regex system'
+    boost_libs = 'system filesystem program_options regex thread log log_setup'
     if conf.options.with_tests:
         conf.env['WITH_TESTS'] = True
         conf.define('WITH_TESTS', 1)
-        boost_libs += ' filesystem unit_test_framework'
-    conf.check_boost(lib=boost_libs)
+        boost_libs += ' unit_test_framework'
+    conf.check_boost(lib=boost_libs, mt=True)
 
     conf.recurse('tools')
 
@@ -50,6 +50,7 @@
     bld(features='subst',
         source='core/version.cpp.in',
         target='core/version.cpp',
+        name='version.cpp',
         VERSION_BUILD=VERSION)
 
     bld.objects(target='core-objects',
@@ -62,47 +63,55 @@
     bld.recurse('tests')
     bld.recurse('manpages')
 
-def version(bld):
-    # Modified from ndn-cxx wscript
+def version(ctx):
+    # don't execute more than once
+    if getattr(Context.g_module, 'VERSION_BASE', None):
+        return
+
+    Context.g_module.VERSION_BASE = Context.g_module.VERSION
+    Context.g_module.VERSION_SPLIT = VERSION_BASE.split('.')
+
+    # first, try to get a version string from git
+    gotVersionFromGit = False
     try:
         cmd = ['git', 'describe', '--always', '--match', '%s*' % GIT_TAG_PREFIX]
-        p = Utils.subprocess.Popen(cmd, stdout=Utils.subprocess.PIPE,
-                                   stderr=None, stdin=None)
-        out = str(p.communicate()[0].strip())
-        didGetVersion = (p.returncode == 0 and out != "")
-        if didGetVersion:
+        out = subprocess.check_output(cmd, universal_newlines=True).strip()
+        if out:
+            gotVersionFromGit = True
             if out.startswith(GIT_TAG_PREFIX):
-                Context.g_module.VERSION = out[len(GIT_TAG_PREFIX):]
+                Context.g_module.VERSION = out.lstrip(GIT_TAG_PREFIX)
             else:
-                Context.g_module.VERSION = "%s-commit-%s" % (Context.g_module.VERSION, out)
-    except OSError:
+                # no tags matched
+                Context.g_module.VERSION = '%s-commit-%s' % (VERSION_BASE, out)
+    except subprocess.CalledProcessError:
         pass
 
-    versionFile = bld.path.find_node('VERSION')
-
-    if not didGetVersion and versionFile is not None:
+    versionFile = ctx.path.find_node('VERSION')
+    if not gotVersionFromGit and versionFile is not None:
         try:
             Context.g_module.VERSION = versionFile.read()
             return
-        except (OSError, IOError):
+        except EnvironmentError:
             pass
 
     # version was obtained from git, update VERSION file if necessary
     if versionFile is not None:
         try:
-            version = versionFile.read()
-            if version == Context.g_module.VERSION:
-                return # no need to update
-        except (OSError, IOError):
-            Logs.warn("VERSION file exists, but not readable")
+            if versionFile.read() == Context.g_module.VERSION:
+                # already up-to-date
+                return
+        except EnvironmentError as e:
+            Logs.warn('%s exists but is not readable (%s)' % (versionFile, e.strerror))
     else:
-        versionFile = bld.path.make_node('VERSION')
-
-    # neither git describe nor VERSION file contain the version, so fall back to constant in wscript
-    if versionFile is None:
-        Context.g_module.VERSION = VERSION
+        versionFile = ctx.path.make_node('VERSION')
 
     try:
         versionFile.write(Context.g_module.VERSION)
-    except (OSError, IOError):
-        Logs.warn("VERSION file is not writeable")
+    except EnvironmentError as e:
+        Logs.warn('%s is not writable (%s)' % (versionFile, e.strerror))
+
+def dist(ctx):
+    version(ctx)
+
+def distcheck(ctx):
+    version(ctx)