commit b45eed2d28d332bfb899630b7d1ddb71e8540636
author Vince Lehman <vslehman@memphis.edu> Tue Jan 13 14:58:07 2015 -0600
committer Vince Lehman <vslehman@memphis.edu> Wed Jan 14 09:50:08 2015 -0600
tree 9e5e3df5784a62e79868f409714e6ace02cd4771
parent a2228c6e1f4942e50336d83e359f8b536e94073e

build: Require OpenSSL

refs: #2375

Change-Id: I0fe7c44b9e025bbe9a2e58cf0cab95069e668945

.jenkins.d/30-tests.sh

diff --git a/.jenkins.d/30-tests.sh b/.jenkins.d/30-tests.sh
index 433d450..633dfa7 100755
--- a/.jenkins.d/30-tests.sh
+++ b/.jenkins.d/30-tests.sh
@@ -2,4 +2,6 @@
 set -x
 set -e
 
+rm -Rf ~/.ndn
+
 ./build/unit-tests-nlsr -l test_suite

.waf-tools/openssl.py

diff --git a/.waf-tools/openssl.py b/.waf-tools/openssl.py
index e2ba7d0..dae6a86 100644
--- a/.waf-tools/openssl.py
+++ b/.waf-tools/openssl.py
@@ -30,10 +30,11 @@
         libcrypto = self.check_cxx(lib=['ssl', 'crypto'],
                        msg='Checking for OpenSSL library',
                        define_name='HAVE_%s' % var,
+                       global_define=True,
                        uselib_store=var,
                        mandatory=mandatory,
-                       cxxflags="-I%s/include" % root,
-                       linkflags="-L%s/lib" % root)
+                       includes="%s/include" % root,
+                       libpath="%s/lib" % root)
     else:
         libcrypto = self.check_cxx(lib=['ssl', 'crypto'],
                        msg='Checking for OpenSSL library',

wscript

diff --git a/wscript b/wscript
index aa6c002..7364b07 100644
--- a/wscript
+++ b/wscript
@@ -48,11 +48,13 @@
                'doxygen', 'sphinx_build'])
 
     conf.check_cfg(package='libndn-cxx', args=['--cflags', '--libs'],
-                   uselib_store='NDN_CPP', mandatory=True)
+                   uselib_store='NDN_CXX', mandatory=True)
 
     conf.check_cfg(package='liblog4cxx', args=['--cflags', '--libs'],
                    uselib_store='LOG4CXX', mandatory=True)
 
+    conf.check_openssl(mandatory=True)
+
     boost_libs = 'system chrono program_options iostreams thread regex filesystem'
     if conf.options.with_tests:
         conf.env['WITH_TESTS'] = 1
@@ -98,7 +100,7 @@
         name='nsync-objects',
         features='cxx',
         source=bld.path.ant_glob(['nsync/**/*.cc', 'nsync/**/*.proto']),
-        use='BOOST NDN_CPP OPENSSL',
+        use='BOOST NDN_CXX OPENSSL',
         includes='nsync',
         export_includes='nsync',
         )
@@ -109,7 +111,7 @@
         features='cxx',
         source=bld.path.ant_glob(['src/**/*.cpp'],
                                  excl=['src/main.cpp']),
-        use='nsync-objects NDN_CPP BOOST LOG4CXX',
+        use='nsync-objects NDN_CXX BOOST LOG4CXX',
         includes='. src',
         export_includes='. src',
         )