From fa257b7e980fbdb910224787a12b4102169729e2 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 20 Sep 2012 16:01:23 -0700
Subject: [PATCH] Fix rust-opengles; build rust-io-surface

---
 Makefile.in | 26 +++++++++++++++++++++++---
 configure   |  2 ++
 2 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index 879a2bb31b5..dee1504103c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -30,6 +30,7 @@ RUSTLIBS = \
 	-L src/rust-http-client \
 	-L src/rust-hubbub \
 	-L src/rust-core-foundation \
+	-L src/rust-io-surface \
 	$(NULL)
 
 RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@@ -53,17 +54,25 @@ LAYERS_DEPS = \
 ifeq ($(OSTYPE),darwin)
     SERVO_DEPS += \
 	src/rust-cocoa/libcocoa.dummy \
-	src/rust-core-foundation/librustcorefoundation.dummy
+	src/rust-core-foundation/librustcorefoundation.dummy \
+	src/rust-io-surface/librustiosurface.dummy
     # I want the cocoa check to come before the servo check since if cocoa
     # doesn't work neither does servo
-    CHECK_DEPS += check-rust-cocoa check-rust-core-foundation
-    CLEAN_DEPS += clean-rust-cocoa clean-rust-core-foundation
+    CHECK_DEPS += \
+	check-rust-cocoa \
+	check-rust-core-foundation \
+	check-rust-io-surface
+    CLEAN_DEPS += \
+	clean-rust-cocoa \
+	clean-rust-core-foundation \
+	clean-rust-io-surface
     AZURE_DEPS += \
 	src/rust-cocoa/libcocoa.dummy \
 	src/rust-core-foundation/librustcorefoundation.dummy
     LAYERS_DEPS += \
 	src/rust-cocoa/libcocoa.dummy \
 	src/rust-core-foundation/librustcorefoundation.dummy
+	IOSURFACE_DEPS = src/rust-core-foundation/librustcorefoundation.dummy
 endif
 
 SERVO_DEPS += \
@@ -171,6 +180,8 @@ libhubbub: src/libhubbub/libhubbub.dummy
 
 servo-sandbox: src/servo-sandbox/servo-sandbox.dummy
 
+rust-io-surface: src/rust-io-surface/librustiosurface.dummy
+
 
 # Subproject rules
 
@@ -224,6 +235,9 @@ src/rust-hubbub/librusthubbub.dummy:
 src/rust-core-foundation/librustcorefoundation.dummy:
 	$(MAKE) -C src/rust-core-foundation
 
+src/rust-io-surface/librustiosurface.dummy: $(IOSURFACE_DEPS)
+	RUSTFLAGS="$(RUSTFLAGS) -L ../rust-core-foundation" $(MAKE) -C src/rust-io-surface
+
 
 # Testing targets
 
@@ -272,6 +286,9 @@ check-rust-http-client:
 check-rust-core-foundation:
 	$(MAKE) check -C src/rust-core-foundation
 
+check-rust-io-surface:
+	$(MAKE) check -C src/rust-io-surface
+
 # Clean targets
 
 .PHONY:	clean $(CLEAN_DEPS)
@@ -326,6 +343,9 @@ clean-servo-sandbox:
 clean-rust-hubbub:
 	$(MAKE) clean -C src/rust-hubbub
 
+clean-rust-io-surface:
+	$(MAKE) clean -C src/rust-io-surface
+
 clean-servo:
 	rm -f servo servo-test
 
diff --git a/configure b/configure
index f1777f97606..9e8e0d4c909 100755
--- a/configure
+++ b/configure
@@ -336,6 +336,7 @@ make_dir src/libhubbub
 make_dir src/servo-sandbox
 make_dir src/rust-hubbub
 make_dir src/rust-core-foundation
+make_dir src/rust-io-surface
 
 make_dir src/test/ref
 
@@ -359,6 +360,7 @@ step_msg "running submodule configure scripts"
 (cd ${CFG_BUILD_DIR}src/servo-sandbox && sh ${CFG_SRC_DIR}src/servo-sandbox/configure) || exit $?
 (cd ${CFG_BUILD_DIR}src/rust-hubbub && sh ${CFG_SRC_DIR}src/rust-hubbub/configure) || exit $?
 (cd ${CFG_BUILD_DIR}src/rust-core-foundation && sh ${CFG_SRC_DIR}src/rust-core-foundation/configure) || exit $?
+(cd ${CFG_BUILD_DIR}src/rust-io-surface && sh ${CFG_SRC_DIR}src/rust-io-surface/configure) || exit $?
 
 step_msg "writing configuration"