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

disable sqlite rtree check as it looks impossible to get working against ubuntu/debian packages - re-opens #403

Browse source
This commit is contained in:
Dane Springmeyer 2011-04-18 23:45:24 +00:00
parent 74bb2da73b
commit 50fefa79f0
1 changed files with 17 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
SConstruct
View file

@ -818,6 +818,12 @@ int main()
return False return False
def sqlite_has_rtree(context): def sqlite_has_rtree(context):
""" check an sqlite3 install has rtree support.
PRAGMA compile_options;
http://www.sqlite.org/c3ref/compileoption_get.html
"""
ret = context.TryRun(""" ret = context.TryRun("""
extern "C" { extern "C" {
@ -827,6 +833,7 @@ extern "C" {
int main() int main()
{ {
sqlite3_rtree_geometry *p; sqlite3_rtree_geometry *p;
//sqlite3_compileoption_used("ENABLE_RTREE");
return 0; return 0;
} }
@ -1116,12 +1123,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']):
@ -1133,10 +1140,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