bug 474732 - Rerunning configure causes the world to be rebuilt, comm-central part, r=Standard8
authorRobert Kaiser <kairo@kairo.at>
Sat, 31 Jan 2009 15:52:10 +0100
changeset 1812 9b11d41b0844ce188b90331d2d2131c2440da73c
parent 1811 e2ce0613a99730b50019a7cafbe0a0487571c1f9
child 1813 414e865ea429eb5f58e4e7e8b5e7fc3845f34093
push idunknown
push userunknown
push dateunknown
reviewersStandard8
bugs474732
bug 474732 - Rerunning configure causes the world to be rebuilt, comm-central part, r=Standard8
configure.in
--- a/configure.in
+++ b/configure.in
@@ -7526,18 +7526,28 @@ echo $MAKEFILES | ${PERL} $srcdir/mozill
 else
 echo $MAKEFILES | ${PERL} $srcdir/mozilla/build/autoconf/acoutput-fast.pl -nowrap --cygwin-srcdir=$srcdir > conftest.sh
 fi
 . ./conftest.sh
 rm conftest.sh
 
 echo $MAKEFILES > unallmakefiles
 
+mv -f config/autoconf.mk config/autoconf.mk.orig 2> /dev/null
+
 AC_OUTPUT($MAKEFILES)
 
+dnl Prevent the regeneration of autoconf.mk forcing rebuilds of the world
+if cmp -s config/autoconf.mk config/autoconf.mk.orig; then
+  echo "config/autoconf.mk is unchanged"
+  mv -f config/autoconf.mk.orig config/autoconf.mk 2> /dev/null
+else
+  rm -f config/autoconf.mk.orig 2> /dev/null
+fi
+
 dnl ========================================================
 dnl = Setup a nice relatively clean build environment for
 dnl = sub-configures.
 dnl ========================================================
 CC="$_SUBDIR_CC" 
 CXX="$_SUBDIR_CXX" 
 CFLAGS="$_SUBDIR_CFLAGS" 
 CPPFLAGS="$_SUBDIR_CPPFLAGS"