From e641c78a590ce72eb53de82349c9e01722b039e5 Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@dbsgeo.com>
Date: Tue, 30 Jul 2013 06:35:52 +0000
Subject: [PATCH] scons: fix configure check for sqlite_rtree on linux when
 sqlite3 is statically linked

---
 SConstruct | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/SConstruct b/SConstruct
index e6d6bba14..e21917bcd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1402,7 +1402,6 @@ if not preconfigured:
                         env.Replace(**backup)
                         env['SKIPPED_DEPS'].append(details['lib'])
                     if plugin == 'sqlite':
-                        SQLITE_HAS_RTREE = conf.sqlite_has_rtree()
                         sqlite_backup = env.Clone().Dictionary()
                         # if statically linking, on linux we likely
                         # need to link sqlite to pthreads and dl
@@ -1417,8 +1416,7 @@ if not preconfigured:
                                             env.Append(LIBS=lib)
                                 except OSError,e:
                                     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:
                             env.Replace(**sqlite_backup)
                             if details['lib'] in env['LIBS']: