commit ce841caec40fb9b57df66e7b4e6c88707ca5972b
author Yingdi Yu <yuyingdi@gmail.com> Sat Dec 14 08:28:00 2013 +0800
committer Yingdi Yu <yuyingdi@gmail.com> Sat Dec 14 08:28:00 2013 +0800
tree 010ccf7b314cc9f00b61e0a2e19c7eca4e484955
parent 7bfcd651a0f2406369c7ac189b4389db0eca2875

Chaing waf to use ndn-cpp and ndn-cpp-et libs

wscript

diff --git a/wscript b/wscript
index 63c8eb2..0c1783e 100644
--- a/wscript
+++ b/wscript
@@ -15,9 +15,11 @@
     syncopt.add_option('--log4cxx', action='store_true',default=False,dest='log4cxx',help='''Compile with log4cxx''')
     syncopt.add_option('--test', action='store_true',default=False,dest='_test',help='''build unit tests''')
 
+    opt.load('ndn_cpp', tooldir=['waf-tools'])
+
 def configure(conf):
     conf.load('compiler_c compiler_cxx gnu_dirs boost')
-    # conf.load('ndnx')
+    conf.load('ndn_cpp')
 
     if conf.options.debug:
         conf.define ('_DEBUG', 1)
@@ -34,7 +36,9 @@
 
     # conf.check_ndnx ()
 
-    conf.check_cfg(package='libndn.cxx', args=['--cflags', '--libs'], uselib_store='NDNCXX', mandatory=True)
+    conf.check_ndncpp (path=conf.options.ndn_cpp_dir)
+    conf.check_cfg(package='libndn-cpp-et', args=['--cflags', '--libs'], uselib_store='NDN-CPP-ET', mandatory=True)
+    
     conf.check_cfg(package='openssl', args=['--cflags', '--libs'], uselib_store='OPENSSL', mandatory=True)
     # conf.check_openssl ()
 
@@ -56,10 +60,10 @@
 def build (bld):
     libsync = bld (
         target="ChronoSync",
-        vnum = "1.0.0",
+        # vnum = "1.0.0",
         features=['cxx', 'cxxshlib'],
         source =  bld.path.ant_glob (['src/**/*.cc', 'src/**/*.proto']),
-        use = 'BOOST BOOST_IOSTREAMS BOOST_THREAD SSL NDNCXX OPENSSL',
+        use = 'BOOST BOOST_IOSTREAMS BOOST_THREAD SSL NDNCPP NDN-CPP-ET OPENSSL',
         includes = ['src'],
         )