Merge branch 'master' into libuv-0.10-headless-display

Conflicts:
	common/curl_request.cpp
	common/glfw_view.cpp
	common/glfw_view.hpp
	include/mbgl/platform/request.hpp
	ios/mapbox-gl-cocoa
	setup-libraries.sh
	src/map/map.cpp
	src/platform/request.cpp
	test/fixtures/fixture_request.cpp

1 files changed, 9 insertions, 0 deletions

diff --git a/configure b/configure
index e8f880b543..b92f97758b 100755
--- a/configure
+++ b/configure
@@ -107,6 +107,14 @@ def configure_curl(o):
   o['variables']['curl_libraries'] = ret[0].split()
   o['variables']['curl_cflags'] = ret[1].split()
 
+def configure_sqlite3(o):
+  ret = pkg_config('sqlite3', options.pkgconfig_root)
+  if not ret:
+      sys.stderr.write('could not find sqlite3 with pkg-config')
+      sys.exit(-1)
+  o['variables']['sqlite3_libraries'] = ret[0].split()
+  o['variables']['sqlite3_cflags'] = ret[1].split()
+
 def write(filename, data):
   filename = os.path.join(root_dir, filename)
   print "creating ", filename
@@ -129,6 +137,7 @@ if __name__ == '__main__':
   configure_uv(output)
   configure_png(output)
   configure_curl(output)
+  configure_sqlite3(output)
   pprint.pprint(output, indent=2)
 
   write('config.gypi', "# Do not edit. Generated by the configure script.\n" +