From 10f336055cb13518690f8d280240d30e3f13e508 Mon Sep 17 00:00:00 2001
From: Graydon Hoare <graydon@mozilla.com>
Date: Fri, 25 Mar 2011 10:29:45 -0700
Subject: Auto-reconfigure on Makefile.in or configure change.

---
 Makefile.in | 10 ++++++++++
 configure   |  3 +++
 2 files changed, 13 insertions(+)

diff --git a/Makefile.in b/Makefile.in
index d94da8dc..e2cf9f34 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -1106,6 +1106,16 @@ endif
 
 depend: boot/rustboot$(X) $(CRATE_DEPFILES) $(ML_DEPFILES) $(C_DEPFILES)
 
+
+######################################################################
+# Re-configuration
+######################################################################
+
+config.mk: $(S)configure $(S)Makefile.in
+	@$(call E, cfg: reconfiguring)
+	$(S)configure $(CFG_CONFIGURE_ARGS)
+
+
 ######################################################################
 # Distribution
 ######################################################################
diff --git a/configure b/configure
index 529ad8ad..573ffe91 100755
--- a/configure
+++ b/configure
@@ -87,6 +87,8 @@ CFG_CPUTYPE=$(uname -m)
 CFG_SELF=$(echo $0 | tr '\' '/')
 CFG_SRC_DIR=${CFG_SELF%${CFG_SELF##*/}}
 CFG_BUILD_DIR=$(echo $PWD | tr '\' '/')
+CFG_CONFIGURE_ARGS="$@"
+
 
 msg "recreating config.mk"
 echo '' >config.mk
@@ -108,6 +110,7 @@ putvar CFG_SRC_DIR
 putvar CFG_BUILD_DIR
 putvar CFG_OSTYPE
 putvar CFG_CPUTYPE
+putvar CFG_CONFIGURE_ARGS
 
 msg "looking for build programs"
 probe_need CFG_GCC          gcc
-- 
cgit v1.2.3