commit 96d523b9d20a1d2c2816b4c6928cd3b6f1bcdc77
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Apr 10 16:03:49 2014 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Apr 10 16:03:49 2014 -0700
tree db111324623f67f1bca3c635fa3ce5c8400e4ea7
parent 07ffe0d2142b10bd5c6cd2a35e56a63df75667f7

build: Fix boost and openssl detection scripts

Change-Id: I3a5ed9d589030454bde6e98ab2f1ad568e64adce

.waf-tools/boost.py

diff --git a/.waf-tools/boost.py b/.waf-tools/boost.py
index 2b4b05a..39b5446 100644
--- a/.waf-tools/boost.py
+++ b/.waf-tools/boost.py
@@ -147,7 +147,7 @@
 			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+"(.*)"', re.M)
+			re_but2 = re.compile('^#define\\s+BOOST_VERSION\\s+(\\d*)', re.M)
 			m2 = re_but2.search(txt)
 
 			if m1 and m2:

.waf-tools/openssl.py

diff --git a/.waf-tools/openssl.py b/.waf-tools/openssl.py
index 4a5c01f..eb85462 100644
--- a/.waf-tools/openssl.py
+++ b/.waf-tools/openssl.py
@@ -44,7 +44,7 @@
                        define_name='HAVE_%s' % var,
                        uselib_store=var,
                        mandatory=mandatory,
-                       cflags="-I%s/include" % root,
+                       cxxflags="-I%s/include" % root,
                        linkflags="-L%s/lib" % root,
                        fragment=CODE)
     else: