--- a/tools/build/sync-all-configures
+++ b/tools/build/sync-all-configures
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 for branch in HEAD MOZILLA_1_8_BRANCH MOZILLA_1_8_0_BRANCH; do
-    $HOME/bin/sync-configure-better $branch
+    $HOME/bin/sync-configure $branch
 done

--- a/tools/build/sync-configure
+++ b/tools/build/sync-configure
@@ -1,30 +1,41 @@
 #!/bin/sh -x
 
 # 3/3/03 - Now Runs on bawb as cltbld
 # 5/1/03 - Now Runs on branch as cltbld
 # 2003/02/24 - Now runs on egg as cltbld
+# 2005/08/24 - Modified to take a branch argument (chase)
+# 2006-06-27 - Modified to use hostname -f (dbaron)
+
+BRANCH="HEAD"
+if [ "x$1" != "x" ]; then
+    BRANCH=$1
+fi
 
 # Autoconf ***must*** be 2.13.
 AC="/usr/bin/autoconf-2.13"
 CVS="/usr/bin/cvs"
 CVSROOT='cltbld@cvs.mozilla.org:/cvsroot'
 CVS_RSH=ssh
 PATH="/usr/bin:/bin:/usr/local/bin:/usr/sbin:/usr/bsd:/sbin:/usr/bin:/bin:/usr/etc:/usr/ucb"
 TDIR="/tmp/c-s.$$"
-HOST=`/bin/hostname`
+HOST=`/bin/hostname -f`
 
 export CVSROOT CVS_RSH PATH
 
 rm -rf ${TDIR}
 mkdir ${TDIR}
 cd ${TDIR}
 
-${CVS} -q checkout mozilla/configure.in mozilla/configure mozilla/build/autoconf mozilla/aclocal.m4
+if [ "$BRANCH" = "HEAD" ]; then
+    ${CVS} -q checkout mozilla/configure.in mozilla/configure mozilla/build/autoconf mozilla/aclocal.m4
+else
+    ${CVS} -q checkout -r $BRANCH mozilla/configure.in mozilla/configure mozilla/build/autoconf mozilla/aclocal.m4
+fi
 
 cd mozilla
 ${AC} -l build/autoconf
 
 ${CVS} diff configure >/dev/null 2>&1
 if test "$?" != "0"
 then
 	${CVS} commit -m"Automated update from host $HOST" configure