sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

scons: fix configure check for sqlite_rtree on linux when sqlite3 is statically linked

Browse source
This commit is contained in:
Dane Springmeyer 2013-07-30 06:35:52 +00:00
parent 187ab3fe73
commit e641c78a59
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -1402,7 +1402,6 @@ if not preconfigured:
env.Replace(**backup) env.Replace(**backup)
env['SKIPPED_DEPS'].append(details['lib']) env['SKIPPED_DEPS'].append(details['lib'])
if plugin == 'sqlite': if plugin == 'sqlite':
SQLITE_HAS_RTREE = conf.sqlite_has_rtree()
sqlite_backup = env.Clone().Dictionary() sqlite_backup = env.Clone().Dictionary()
# if statically linking, on linux we likely # if statically linking, on linux we likely
# need to link sqlite to pthreads and dl # need to link sqlite to pthreads and dl
@ -1417,8 +1416,7 @@ if not preconfigured:
env.Append(LIBS=lib) env.Append(LIBS=lib)
except OSError,e: except OSError,e:
pass pass
if SQLITE_HAS_RTREE is None: SQLITE_HAS_RTREE = conf.sqlite_has_rtree()
SQLITE_HAS_RTREE = conf.sqlite_has_rtree()
if not SQLITE_HAS_RTREE: if not SQLITE_HAS_RTREE:
env.Replace(**sqlite_backup) env.Replace(**sqlite_backup)
if details['lib'] in env['LIBS']: if details['lib'] in env['LIBS']: