From f9ae85fcbe24ee79bdf3f4065031530940030e1d Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Thu, 26 Jul 2012 17:50:08 -0700
Subject: [PATCH] Revert "Stop building Ragel"

This reverts commit ad047d1f74aa8b85679a5a2109d68850d1bc3c14.
---
 Makefile.in  | 12 ++++++++++--
 configure.in |  2 ++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/Makefile.in b/Makefile.in
index fe7ab696f63..b1b80ddb0bd 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -84,6 +84,7 @@ CHECK_DEPS += \
 	$(NULL)
 
 CLEAN_DEPS += \
+	clean-ragel \
 	clean-harfbuzz \
 	clean-rust-harfbuzz \
 	clean-mozjs \
@@ -110,8 +111,11 @@ libservo.dummy: $(SERVO_DEPS)
 servo-test: $(SERVO_DEPS)
 	$(RUSTC) $(RUSTFLAGS) $(RUSTLIBS) --test -o $@ $<
 
-src/harfbuzz/src/.libs/libharfbuzz.a:
-	$(MAKE) -C src/harfbuzz CXXFLAGS=-fPIC LDFLAGS="-fPIC -lstdc++"
+src/ragel/ragel/ragel:
+	$(MAKE) -C src/ragel
+
+src/harfbuzz/src/.libs/libharfbuzz.a: src/ragel/ragel/ragel
+	$(MAKE) -C src/harfbuzz PATH=$(PATH):$(BUILD_DIR)/src/ragel/ragel CXXFLAGS=-fPIC LDFLAGS="-fPIC -lstdc++"
 
 src/mozjs/libjs_static.a:
 	$(MAKE) -C src/mozjs
@@ -198,6 +202,10 @@ check-rust-layers: $(LAYERS_DEPS)
 .PHONY:	clean
 clean: $(CLEAN_DEPS)
 
+.PHONY: clean-ragel
+clean-ragel:
+	$(MAKE) clean -C src/ragel
+
 .PHONY: clean-harfbuzz
 clean-harfbuzz:
 	$(MAKE) clean -C src/harfbuzz
diff --git a/configure.in b/configure.in
index 1114f2cc428..24911354be7 100755
--- a/configure.in
+++ b/configure.in
@@ -3,6 +3,7 @@
 SRCDIR="$(cd $(dirname $0) && pwd)"
 sed "s#%VPATH%#${SRCDIR}#" ${SRCDIR}/Makefile.in > Makefile
 
+mkdir -p src/ragel || exit $?
 mkdir -p src/harfbuzz || exit $?
 mkdir -p src/mozjs || exit $?
 mkdir -p src/rust-harfbuzz || exit $?
@@ -16,6 +17,7 @@ mkdir -p src/rust-geom || exit $?
 mkdir -p src/rust-glut || exit $?
 mkdir -p src/rust-layers || exit $?
 
+(cd src/ragel && sh ${SRCDIR}/src/ragel/configure) || exit $?
 (cd src/harfbuzz && sh ${SRCDIR}/src/harfbuzz/configure --enable-static) || 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 $?