From fb35d1815f3084ec205530053f571d66113c646b Mon Sep 17 00:00:00 2001
From: Dane Springmeyer <dane@mapbox.com>
Date: Mon, 2 Feb 2015 21:41:11 -0800
Subject: [PATCH] travis: build against pycairo

---
 .travis.yml  | 3 +++
 bootstrap.sh | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index da7cb455e..55cb2c60d 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -24,6 +24,9 @@ install:
 
 script:
  - source bootstrap.sh
+ # also install pycairo
+ - wget https://gist.githubusercontent.com/springmeyer/0833fa43794838889139/raw/build_pycairo.sh && chmod +x build_pycairo.sh && ./build_pycairo.sh
+ - export PYTHONPATH=$(pwd)/mason_packages/.link/lib/python2.7/site-packages:${PYTHONPATH}
  - ./configure
  - cat config.log
  - make
diff --git a/bootstrap.sh b/bootstrap.sh
index 6b28b096e..fcb2d8dbb 100755
--- a/bootstrap.sh
+++ b/bootstrap.sh
@@ -71,7 +71,6 @@ function setup_nose() {
 
 function make_config() {
     local MASON_LINKED_REL=./mason_packages/.link
-    export PKG_CONFIG_PATH="${MASON_LINKED_REL}/lib/pkgconfig"
     export C_INCLUDE_PATH="${MASON_LINKED_REL}/include"
     export CPLUS_INCLUDE_PATH="${MASON_LINKED_REL}/include"
     export LIBRARY_PATH="${MASON_LINKED_REL}/lib"
@@ -85,6 +84,7 @@ CUSTOM_LDFLAGS = '-L${MASON_LINKED_REL}/lib'
 RUNTIME_LINK = 'static'
 INPUT_PLUGINS = 'all'
 PATH = '${MASON_LINKED_REL}/bin'
+PKG_CONFIG_PATH = '${MASON_LINKED_REL}/lib/pkgconfig'
 PATH_REMOVE = '/usr:/usr/local'
 PATH_REPLACE = '/Users/travis/build/mapbox/mason/mason_packages:./mason_packages'
 BOOST_INCLUDES = '${MASON_LINKED_REL}/include'