From 16c68489582348f8dbb604e14b2eeac22dd9fbe7 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Tue, 21 Aug 2012 15:45:59 -0700
Subject: [PATCH] Build the servo-sandbox

---
 Makefile.in       | 6 ++++++
 configure.in      | 2 ++
 src/libhubbub     | 2 +-
 src/servo-sandbox | 1 +
 4 files changed, 10 insertions(+), 1 deletion(-)
 create mode 160000 src/servo-sandbox

diff --git a/Makefile.in b/Makefile.in
index 7067d6e8a15..ea3ae29bca1 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -71,6 +71,7 @@ SERVO_DEPS += \
 	src/rust-http-client/libhttp_client.dummy \
 	src/libparserutils/libparserutils.dummy \
 	src/libhubbub/libhubbub.dummy \
+	src/servo-sandbox/servo-sandbox.dummy \
 	$(NULL)
 
 CHECK_DEPS += \
@@ -151,6 +152,8 @@ libparserutils: src/libparserutils/libparserutils.dummy
 
 libhubbub: src/libhubbub/libhubbub.dummy
 
+servo-sandbox: src/servo-sandbox/servo-sandbox.dummy
+
 
 # Subproject rules
 
@@ -195,6 +198,9 @@ src/libparserutils/libparserutils.dummy:
 src/libhubbub/libhubbub.dummy:
 	$(MAKE) -C src/libhubbub
 
+src/servo-sandbox/servo-sandbox.dummy:
+	$(MAKE) -C src/servo-sandbox
+
 
 # Testing targets
 
diff --git a/configure.in b/configure.in
index 92c125411b4..0b8867704dc 100755
--- a/configure.in
+++ b/configure.in
@@ -16,6 +16,7 @@ mkdir -p src/rust-layers || exit $?
 mkdir -p src/rust-http-client || exit $?
 mkdir -p src/libparserutils || exit $?
 mkdir -p src/libhubbub || exit $?
+mkdir -p src/servo-sandbox || exit $?
 
 (cd src/mozjs && sh ${SRCDIR}/src/mozjs/js/src/configure --enable-debug --disable-optimize) || exit $?
 (cd src/rust-opengles && sh ${SRCDIR}/src/rust-opengles/configure) || exit $?
@@ -30,3 +31,4 @@ mkdir -p src/libhubbub || exit $?
 (cd src/rust-http-client && sh ${SRCDIR}/src/rust-http-client/configure) || exit $?
 (cd src/libparserutils && sh ${SRCDIR}/src/libparserutils/configure) || exit $?
 (cd src/libhubbub && sh ${SRCDIR}/src/libhubbub/configure) || exit $?
+(cd src/servo-sandbox && sh ${SRCDIR}/src/servo-sandbox/configure) || exit $?
diff --git a/src/libhubbub b/src/libhubbub
index 04649ec414e..e34e5f67f3d 160000
--- a/src/libhubbub
+++ b/src/libhubbub
@@ -1 +1 @@
-Subproject commit 04649ec414e28b28999ee435593d1f55ab1f5806
+Subproject commit e34e5f67f3de6135865a99a4a545c1f78c2e67a3
diff --git a/src/servo-sandbox b/src/servo-sandbox
new file mode 160000
index 00000000000..4fc86aceb44
--- /dev/null
+++ b/src/servo-sandbox
@@ -0,0 +1 @@
+Subproject commit 4fc86aceb448ebb9658664e60e8ffdb1d5e3c989