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

scons: ensure you can build pgsql2sqlite even if the sqlite datasource plugin is not requested

Browse source
This commit is contained in:
Dane Springmeyer 2012-08-16 16:21:10 -07:00
parent e0608a4aa4
commit 9ef6c0dce1
1 changed files with 4 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
SConstruct
View file

@ -1243,6 +1243,10 @@ if not preconfigured:
env.PrependUnique(LIBPATH = '#src', delete_existing=True) env.PrependUnique(LIBPATH = '#src', delete_existing=True)
if env['PGSQL2SQLITE']: if env['PGSQL2SQLITE']:
if 'sqlite3' not in env['LIBS']:
env.AppendUnique(LIBS='sqlite3')
env.AppendUnique(CPPPATH = os.path.realpath(env['SQLITE_INCLUDES']))
env.AppendUnique(LIBPATH = os.path.realpath(env['SQLITE_LIBS']))
if not conf.sqlite_has_rtree(): if not conf.sqlite_has_rtree():
env['SKIPPED_DEPS'].append('pgsql2sqlite_rtree') env['SKIPPED_DEPS'].append('pgsql2sqlite_rtree')
env['PGSQL2SQLITE'] = False env['PGSQL2SQLITE'] = False