From e1ee6f0d06c98390a34904d77fe87cb2bc69f4d2 Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 7 Mar 2013 18:28:42 -0800
Subject: [PATCH 1/2] Update submodules to fix tests

---
 src/rust-azure  | 2 +-
 src/rust-glut   | 2 +-
 src/rust-layers | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/rust-azure b/src/rust-azure
index 28dbde9f940..9ff76d96b3f 160000
--- a/src/rust-azure
+++ b/src/rust-azure
@@ -1 +1 @@
-Subproject commit 28dbde9f94091de97035246155b5bff08f768fdc
+Subproject commit 9ff76d96b3f2e2aa00befd0a30920e8dad41ab95
diff --git a/src/rust-glut b/src/rust-glut
index 916004c3f4b..513d8bc6721 160000
--- a/src/rust-glut
+++ b/src/rust-glut
@@ -1 +1 @@
-Subproject commit 916004c3f4bc30515085fe4bb888338805a06aa9
+Subproject commit 513d8bc672153a52bac4198f2febd504c1d4a635
diff --git a/src/rust-layers b/src/rust-layers
index 584299c9d2c..993eb6590b7 160000
--- a/src/rust-layers
+++ b/src/rust-layers
@@ -1 +1 @@
-Subproject commit 584299c9d2c7a48bb31bbb8a64a1d20d99083796
+Subproject commit 993eb6590b73ab873730a94a421a97bc1a485b02

From cb72a94e1bda324d6e5ae3348f4a0ad4af30d1f6 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Fri, 8 Mar 2013 20:24:56 -0500
Subject: [PATCH 2/2] Add extra aclocal config required for homebrew

On at least some homebrew systems you will encounter the following
error after a new install when running servo's configure:

    servo/src/pixman/configure: line 13682: PKG_PROG_PKG_CONFIG: command not found
    servo/src/pixman/configure: line 13756: syntax error near unexpected token `GTK,'
    servo/src/pixman/configure: line 13756: `   PKG_CHECK_MODULES(GTK, gtk+-2.0 pixman-1)'

This appears to be related to mxcl/homebrew#5117 and mxcl/homebrew#3209.

Add a note to the README.md about how to resolve this issue with some
manual configuration.
---
 README.md | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/README.md b/README.md
index efe17fee7e5..5872d0ea153 100644
--- a/README.md
+++ b/README.md
@@ -11,6 +11,11 @@ On OS X (homebrew):
     brew install automake libtool
     brew install pkg-config
 
+Note, there is an [issue][] on homebrew which requires the following manual
+configuration as well:
+
+    sudo sh -c 'echo /usr/local/share/aclocal >> /usr/share/aclocal/dirlist'
+
 On OS X (MacPorts):
 
     sudo port install autoconf213
@@ -30,3 +35,5 @@ compiler.
     ../configure
     make && make check
     ./servo ../src/test/about-mozilla.html
+
+[issue]: https://github.com/mxcl/homebrew/issues/5117