build: Upgrade waf to version 2.0.6
This commit also includes:
- cleanup of build scripts
- replacing log4cxx with ndn-cxx logging facility
Change-Id: I96fd673a3cd2e06061e9efc1a7891e41cf97ea4f
diff --git a/.waf-tools/sqlite3.py b/.waf-tools/sqlite3.py
index 28dd57c..7ddbf0f 100644
--- a/.waf-tools/sqlite3.py
+++ b/.waf-tools/sqlite3.py
@@ -1,7 +1,7 @@
#! /usr/bin/env python
# encoding: utf-8
-from waflib import Options
+from waflib import Options, Logs
from waflib.Configure import conf
def options(opt):
@@ -19,6 +19,9 @@
mandatory = kw.get('mandatory', True)
var = kw.get('uselib_store', 'SQLITE3')
+ if not self.options.with_sqlite_locking:
+ conf.define('DISABLE_SQLITE3_FS_LOCKING', 1)
+
if root:
self.check_cxx(lib='sqlite3',
msg='Checking for SQLite3 library',
@@ -31,6 +34,8 @@
try:
self.check_cfg(package='sqlite3',
args=['--cflags', '--libs'],
+ global_define=True,
+ define_name='HAVE_%s' % var,
uselib_store='SQLITE3',
mandatory=True)
except: