Update build scripts
Refs: #5042
Change-Id: Ia9f25e636d2f93c0706e5ac5ac3d841208789ec4
diff --git a/.waf-tools/sqlite3.py b/.waf-tools/sqlite3.py
index 7ddbf0f..ad5b930 100644
--- a/.waf-tools/sqlite3.py
+++ b/.waf-tools/sqlite3.py
@@ -1,12 +1,11 @@
#! /usr/bin/env python
# encoding: utf-8
-from waflib import Options, Logs
from waflib.Configure import conf
def options(opt):
- opt.add_option('--with-sqlite3', type='string', default=None,
- dest='with_sqlite3', help='''Path to SQLite3, e.g., /usr/local''')
+ opt.add_option('--with-sqlite3', type='string', default=None, dest='sqlite3_dir',
+ help='directory where SQLite3 is installed, e.g., /usr/local')
opt.add_option('--without-sqlite-locking', action='store_false', default=True,
dest='with_sqlite_locking',
help='''Disable filesystem locking in sqlite3 database '''
@@ -15,7 +14,7 @@
@conf
def check_sqlite3(self, *k, **kw):
- root = k and k[0] or kw.get('path', None) or Options.options.with_sqlite3
+ root = k and k[0] or kw.get('path', self.options.sqlite3_dir)
mandatory = kw.get('mandatory', True)
var = kw.get('uselib_store', 'SQLITE3')
@@ -28,14 +27,12 @@
define_name='HAVE_%s' % var,
uselib_store=var,
mandatory=mandatory,
- includes="%s/include" % root,
- libpath="%s/lib" % root)
+ includes='%s/include' % root,
+ libpath='%s/lib' % root)
else:
try:
self.check_cfg(package='sqlite3',
args=['--cflags', '--libs'],
- global_define=True,
- define_name='HAVE_%s' % var,
uselib_store='SQLITE3',
mandatory=True)
except: