From c56a7e5c25c2a411ba119f3a17bfa6db0b1722ed Mon Sep 17 00:00:00 2001
From: Brian Anderson <banderson@mozilla.com>
Date: Fri, 5 Oct 2012 11:04:45 -0700
Subject: [PATCH] Reorder the submodule ops in configure

---
 configure | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/configure b/configure
index 60de25809c2..e67ea3af5f3 100755
--- a/configure
+++ b/configure
@@ -574,19 +574,23 @@ then
     msg "git: submodule sync"
     "${CFG_GIT}" submodule --quiet sync
 
-    # NB: this is just for the sake of getting the submodule SHA1 values
-    # and status written into the build log.
-    msg "git: submodule status"
-    "${CFG_GIT}" submodule status --recursive
-
     msg "git: submodule update"
-    "${CFG_GIT}" submodule --quiet update --init --recursive
+    "${CFG_GIT}" submodule --quiet update --init
     need_ok "git failed"
 
     msg "git: submodule foreach sync"
     "${CFG_GIT}" submodule --quiet foreach --recursive git submodule sync
     need_ok "git failed"
 
+    msg "git: submodule foreach update"
+    "${CFG_GIT}" submodule --quiet update --init --recursive
+    need_ok "git failed"
+
+    # NB: this is just for the sake of getting the submodule SHA1 values
+    # and status written into the build log.
+    msg "git: submodule status"
+    "${CFG_GIT}" submodule status --recursive
+
     msg "git: submodule clobber"
     "${CFG_GIT}" submodule --quiet foreach --recursive git clean -dxf
     need_ok "git failed"