commit 43e71613e169c32f310f432be37937819e08e7a3
author Yingdi Yu <yuyingdi@gmail.com> Wed Oct 30 22:19:31 2013 -0700
committer Yingdi Yu <yuyingdi@gmail.com> Wed Oct 30 22:19:31 2013 -0700
tree ab38193b0c9d0eeadfe1d84ffab59e34cad5f319
parent f46eac58f51737ffabfb1f56d2cab5221450b641

Adapt sync to use new ndn.cxx api

wscript

diff --git a/wscript b/wscript
index 7ec9fdf..560f1fe 100644
--- a/wscript
+++ b/wscript
@@ -7,7 +7,7 @@
 
 def options(opt):
     opt.load('compiler_c compiler_cxx boost doxygen gnu_dirs protoc')
-    opt.load('ndnx', tooldir=["waf-tools"])
+    # opt.load('ndnx', tooldir=["waf-tools"])
 
     syncopt = opt.add_option_group ("ChronoSync Options")
 
@@ -17,7 +17,7 @@
 
 def configure(conf):
     conf.load('compiler_c compiler_cxx gnu_dirs boost')
-    conf.load('ndnx')
+    # conf.load('ndnx')
 
     if conf.options.debug:
         conf.define ('_DEBUG', 1)
@@ -32,8 +32,11 @@
     else:
         conf.add_supported_cxxflags (cxxflags = ['-O3', '-g'])
 
-    conf.check_ndnx ()
-    conf.check_openssl ()
+    # conf.check_ndnx ()
+
+    conf.check_cfg(package='libndn.cxx', args=['--cflags', '--libs'], uselib_store='NDNCXX', mandatory=True)
+    conf.check_cfg(package='openssl', args=['--cflags', '--libs'], uselib_store='OPENSSL', mandatory=True)
+    # conf.check_openssl ()
 
     conf.check_boost(lib='system iostreams test thread')
 
@@ -55,7 +58,7 @@
         target="ChronoSync",
         features=['cxx', 'cxxshlib'],
         source =  bld.path.ant_glob (['src/**/*.cc', 'src/**/*.proto']),
-        use = 'BOOST BOOST_IOSTREAMS BOOST_THREAD SSL NDNX',
+        use = 'BOOST BOOST_IOSTREAMS BOOST_THREAD SSL NDNCXX OPENSSL',
         includes = ['src'],
         )