From 50fefa79f0bb20a9ee85b903f1ff30197ae43eac Mon Sep 17 00:00:00 2001 From: Dane Springmeyer Date: Mon, 18 Apr 2011 23:45:24 +0000 Subject: [PATCH] disable sqlite rtree check as it looks impossible to get working against ubuntu/debian packages - re-opens #403 --- SConstruct | 27 +++++++++++++++++---------- 1 file changed, 17 insertions(+), 10 deletions(-) diff --git a/SConstruct b/SConstruct index e661c0e6d..debebdf24 100644 --- a/SConstruct +++ b/SConstruct @@ -818,6 +818,12 @@ int main() return False 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(""" extern "C" { @@ -827,6 +833,7 @@ extern "C" { int main() { sqlite3_rtree_geometry *p; + //sqlite3_compileoption_used("ENABLE_RTREE"); return 0; } @@ -1116,12 +1123,12 @@ if not preconfigured: if not conf.CheckLibWithHeader(details['lib'], details['inc'], details['lang']): env.Replace(**backup) env['SKIPPED_DEPS'].append(details['lib']) - if plugin == 'sqlite': - if not conf.sqlite_has_rtree(): - env.Replace(**backup) - if details['lib'] in env['LIBS']: - env['LIBS'].remove(details['lib']) - env['SKIPPED_DEPS'].append('sqlite_rtree') + #if plugin == 'sqlite': + # if not conf.sqlite_has_rtree(): + # env.Replace(**backup) + # if details['lib'] in env['LIBS']: + # env['LIBS'].remove(details['lib']) + # env['SKIPPED_DEPS'].append('sqlite_rtree') elif details['lib'] and details['inc']: 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(LIBPATH = '#src', delete_existing=True) - if env['PGSQL2SQLITE']: - if not conf.sqlite_has_rtree(): - env['SKIPPED_DEPS'].append('pgsql2sqlite_rtree') - env['PGSQL2SQLITE'] = False + #if env['PGSQL2SQLITE']: + # if not conf.sqlite_has_rtree(): + # env['SKIPPED_DEPS'].append('pgsql2sqlite_rtree') + # env['PGSQL2SQLITE'] = False # Decide which libagg to use # if we are using internal agg, then prepend to make sure