From 93570f820a6c5675dea9c686077f1ec99739607f Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Sat, 24 Jan 2015 08:51:16 -0800
Subject: [PATCH] mason bootstrap: expat and sqlite_rtree fixes

---
 SConstruct   | 5 +++++
 bootstrap.sh | 3 +++
 2 files changed, 8 insertions(+)

diff --git a/SConstruct b/SConstruct
index 67b0a2a55..5242ae558 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1476,6 +1476,11 @@ if not preconfigured:
                                         if not lib in env['LIBS']:
                                             env["SQLITE_LINKFLAGS"].append("lib")
                                             env.Append(LIBS=lib)
+                            else:
+                                for lib in ["sqlite3","dl","pthread"]:
+                                    if not lib in env['LIBS']:
+                                        env["SQLITE_LINKFLAGS"].append("lib")
+                                        env.Append(LIBS=lib)
                         SQLITE_HAS_RTREE = conf.sqlite_has_rtree()
                         if not SQLITE_HAS_RTREE:
                             env.Replace(**sqlite_backup)
diff --git a/bootstrap.sh b/bootstrap.sh
index 6bad44396..aee8a79c5 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -119,6 +119,9 @@ DEPS["boost_libpython"]="1.57.0"
 DEPS["gdal"]="1.11.1"
 DEPS["libpq"]="9.4.0"
 DEPS["sqlite"]="3.8.6"
+# gdal deps
+DEPS["expat"]="2.1.0"
+
 
 if [[ -d ~/.mason ]]; then
     export PATH=~/.mason:$PATH