Merge branch 'local-mason'

Conflicts:
	.gitmodules
	styles

6 files changed, 11 insertions, 7 deletions

diff --git a/.gitmodules b/.gitmodules
index 81e2c6f9df..588802377e 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -6,6 +6,10 @@
 	path = test/suite
 	url = https://github.com/mapbox/mapbox-gl-test-suite.git
 
+[submodule ".mason"]
+	path = .mason
+	url = https://github.com/mapbox/mason.git
+
 [submodule "styles"]
 	path = styles
 	url = https://github.com/mapbox/mapbox-gl-styles.git
diff --git a/.mason b/.mason
new file mode 160000
+Subproject 462fe28479ea700943abd2fde15b03038a168da
diff --git a/.travis.yml b/.travis.yml
index 8edbe3c157..a7c7109f03 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,9 +25,9 @@ env:
    - LD_LIBRARY_PATH: '/usr/local/lib'
 
 before_install:
+- source ./scripts/local_mason.sh
 - source ./scripts/travis_helper.sh
 - source ./scripts/flags.sh
-- (git clone https://github.com/mapbox/mason.git ~/.mason ; sudo ln -s ~/.mason/mason /usr/local/bin/mason)
 - ./scripts/travis_before_install.sh
 - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then export LD_LIBRARY_PATH=`mason prefix mesa 10.3.1`/lib; fi
 - if [[ ${TRAVIS_OS_NAME} == "linux" ]]; then glxinfo; fi
diff --git a/configure b/configure
index 8b82a72083..2b5ec80ca2 100755
--- a/configure
+++ b/configure
@@ -2,7 +2,6 @@
 
 set -e
 set -o pipefail
-shopt -s expand_aliases
 
 CONFIG_FILE=${1:-config.gypi}
 
@@ -16,11 +15,7 @@ function finish {
 trap finish EXIT
 
 # Install mason
-if [[ ! -d ~/.mason ]]; then
-    >&2 echo -e "\033[1m\033[32m* Installing Mason\033[0m"
-    git clone https://github.com/mapbox/mason.git ~/.mason
-fi
-alias mason='~/.mason/mason'
+. ./scripts/local_mason.sh
 
 case ${MASON_PLATFORM} in
     'ios')
diff --git a/scripts/local_mason.sh b/scripts/local_mason.sh
new file mode 100755
index 0000000000..2d8687a280
--- /dev/null
+++ b/scripts/local_mason.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+git submodule update --init .mason
+PATH=`pwd`/.mason:$PATH
+export MASON_DIR=`pwd`/.mason
diff --git a/styles b/styles
-Subproject bc7b7c38ef1e668fe6f64ff3b2146a08b57c74c
+Subproject 65dc5c9b7e926a7f43c2834979bd4c7395e8dca