From e15c779b437a0f2f62e58f4107ba79fc3a4d4f89 Mon Sep 17 00:00:00 2001
From: Patrick Walton <pcwalton@mimiga.net>
Date: Thu, 24 May 2012 18:38:32 -0700
Subject: [PATCH] Add stb_image bindings

---
 .gitmodules        |  3 +++
 Makefile.in        | 15 +++++++++++++++
 configure.in       |  2 ++
 src/rust-stb-image |  1 +
 4 files changed, 21 insertions(+)
 create mode 160000 src/rust-stb-image

diff --git a/.gitmodules b/.gitmodules
index db3e6ec53dd..be2055806df 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,3 +22,6 @@
 [submodule "src/ragel"]
 	path = src/ragel
 	url = git://github.com/brson/ragel-dist.git
+[submodule "src/rust-stb-image"]
+	path = src/rust-stb-image
+	url = git://github.com/pcwalton/rust-stb-image.git
diff --git a/Makefile.in b/Makefile.in
index a891c37063a..6285826a333 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -19,6 +19,7 @@ RUSTFLAGS += \
 	-L src/rust-azure \
 	-L src/rust-sdl \
 	-L src/rust-cocoa \
+	-L src/rust-stb-image \
 	$(NULL)
 
 RUST_SRC=$(shell find $(VPATH)/src -type f -name '*.rs')
@@ -43,6 +44,7 @@ SERVO_DEPS += \
 	src/rust-mozjs/libmozjs.dummy \
 	src/rust-azure/libazure.dummy \
 	src/rust-sdl/libsdl.dummy \
+	src/rust-stb-image/libstb-image.dummy \
 	$(NULL)
 
 CHECK_DEPS += \
@@ -50,6 +52,7 @@ CHECK_DEPS += \
 	check-rust-mozjs \
 	check-rust-sdl \
 	check-rust-azure \
+	check-rust-stb-image \
 	check-servo \
 	$(NULL)
 
@@ -60,6 +63,7 @@ CLEAN_DEPS += \
 	clean-rust-mozjs \
 	clean-rust-sdl \
 	clean-rust-azure \
+	clean-rust-stb-image \
 	clean-servo \
 	$(NULL)
 
@@ -96,6 +100,9 @@ src/rust-sdl/libsdl.dummy:
 src/rust-cocoa/libcocoa.dummy:
 	$(MAKE) -C src/rust-cocoa
 
+src/rust-stb-image/libstb-image.dummy:
+	$(MAKE) -C src/rust-stb-image
+
 check: $(CHECK_DEPS)
 
 check-servo: servo-test
@@ -121,6 +128,10 @@ check-rust-sdl:
 check-rust-cocoa:
 	$(MAKE) check -C src/rust-cocoa
 
+.PHONY: check-rust-stb-image
+check-rust-stb-image:
+	$(MAKE) check -C src/rust-stb-image
+
 .PHONY:	clean
 clean: $(CLEAN_DEPS)
 
@@ -152,6 +163,10 @@ clean-rust-sdl:
 clean-rust-cocoa:
 	$(MAKE) clean -C src/rust-cocoa
 
+.PHONY: clean-rust-stb-image
+clean-rust-stb-image:
+	$(MAKE) clean -C src/rust-stb-image
+
 .PHONY: clean-servo
 clean-servo:
 	rm -f servo servo-test
diff --git a/configure.in b/configure.in
index 925588e3669..bcc011c37da 100755
--- a/configure.in
+++ b/configure.in
@@ -11,6 +11,7 @@ mkdir -p src/rust-mozjs || exit $?
 mkdir -p src/rust-sdl || exit $?
 mkdir -p src/rust-azure || exit $?
 mkdir -p src/rust-cocoa || exit $?
+mkdir -p src/rust-stb-image || exit $?
 
 (cd src/ragel && sh ${SRCDIR}/src/ragel/configure) || exit $?
 (cd src/harfbuzz && sh ${SRCDIR}/src/harfbuzz/configure --enable-static) || exit $?
@@ -20,3 +21,4 @@ mkdir -p src/rust-cocoa || exit $?
 (cd src/rust-sdl && sh ${SRCDIR}/src/rust-sdl/configure) || exit $?
 (cd src/rust-azure && sh ${SRCDIR}/src/rust-azure/configure) || exit $?
 (cd src/rust-cocoa && sh ${SRCDIR}/src/rust-cocoa/configure) || exit $?
+(cd src/rust-stb-image && sh ${SRCDIR}/src/rust-stb-image/configure) || exit $?
diff --git a/src/rust-stb-image b/src/rust-stb-image
new file mode 160000
index 00000000000..73229f656e7
--- /dev/null
+++ b/src/rust-stb-image
@@ -0,0 +1 @@
+Subproject commit 73229f656e75517c3906eb20ba1a48e8df3d2584