commit 8e60bcdd8a3645243983d6a8603a927821b5da5e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jan 15 20:55:40 2015 +0000
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Fri Jan 16 12:28:22 2015 -0800
tree 27d50cc5c2825337bc8ae71a377fa1fc227a8eab
parent ab933c620a929135eb261fd36201cb0f1dd7c401

build: Fix compilation on Ubuntu platform and add work-around for ndn-cxx regression

Note that on Ubuntu 12.04, either boost libraries or compiler needs to be upgraded.

Change-Id: I33f1089f961f99abf3d1803bf833e76ff7fb528d
Refs: #2379, #2380, #2382, #2381, #2383

wscript

diff --git a/wscript b/wscript
index 95b16a1..e9ef718 100644
--- a/wscript
+++ b/wscript
@@ -11,8 +11,16 @@
 def required_boost_libs(conf):
     conf.env.REQUIRED_BOOST_LIBS += REQUIRED_BOOST_LIBS
 
+def options(opt):
+    opt.load(['dependency-checker',
+              'doxygen', 'sphinx_build', 'type_traits', 'compiler-features'],
+             tooldir=['%s/.waf-tools' % opt.path.abspath()])
+
 def configure(conf):
-    conf.env['ENABLE_NDNSIM']=False;
+    conf.load(['dependency-checker',
+               'doxygen', 'sphinx_build', 'type_traits', 'compiler-features'])
+
+    conf.env['ENABLE_NDNSIM']=False
 
     conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'],
                    uselib_store='NDN_CXX', mandatory=True)