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

scons: enable the sqlite rtree check

Browse source
This commit is contained in:
Dane Springmeyer 2011-11-13 16:13:37 -08:00
parent b1c2d9f680
commit eb2bd4a6d9
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
SConstruct
View file

@ -1234,12 +1234,12 @@ if not preconfigured:
if not conf.CheckLibWithHeader(details['lib'], details['inc'], details['lang']): if not conf.CheckLibWithHeader(details['lib'], details['inc'], details['lang']):
env.Replace(**backup) env.Replace(**backup)
env['SKIPPED_DEPS'].append(details['lib']) env['SKIPPED_DEPS'].append(details['lib'])
#if plugin == 'sqlite': if plugin == 'sqlite':
# if not conf.sqlite_has_rtree(): if not conf.sqlite_has_rtree():
# env.Replace(**backup) env.Replace(**backup)
# if details['lib'] in env['LIBS']: if details['lib'] in env['LIBS']:
# env['LIBS'].remove(details['lib']) env['LIBS'].remove(details['lib'])
# env['SKIPPED_DEPS'].append('sqlite_rtree') env['SKIPPED_DEPS'].append('sqlite_rtree')
elif details['lib'] and details['inc']: elif details['lib'] and details['inc']:
if not conf.CheckLibWithHeader(details['lib'], details['inc'], details['lang']): if not conf.CheckLibWithHeader(details['lib'], details['inc'], details['lang']):
@ -1251,10 +1251,10 @@ if not preconfigured:
env.PrependUnique(CPPPATH = '#', delete_existing=True) env.PrependUnique(CPPPATH = '#', delete_existing=True)
env.PrependUnique(LIBPATH = '#src', delete_existing=True) env.PrependUnique(LIBPATH = '#src', delete_existing=True)
#if env['PGSQL2SQLITE']: if env['PGSQL2SQLITE']:
# 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
# Decide which libagg to use # Decide which libagg to use
# if we are using internal agg, then prepend to make sure # if we are using internal agg, then prepend to make sure