Bug 414515 - Nightlies should not override the module-specific build settings, r=ted

tools/tinderbox-configs/thunderbird/linux/CLOBBER

@@ -1 +1 @@
-Clobbering to test new ref platform deployment (bug 396990).
+Clobbering to pick up bug 414515 mozconfig changes

tools/tinderbox-configs/thunderbird/linux/mozconfig

@@ -1,9 +1,12 @@
 #
 ## hostname: tb-linux-tbox
 ## uname: Linux tb-linux-tbox.build.mozilla.org 2.6.18-8.el5 #1 SMP Thu Mar 15 19:57:35 EDT 2007 i686 athlon i386 GNU/Linux
- 
 #
 
+# symbols for breakpad
+export CFLAGS="-gstabs+"
+export CXXFLAGS="-gstabs+"
+
 mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZ_MAKE_FLAGS=-j3
 mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
@@ -12,12 +15,12 @@ ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=nightly
 ac_add_options --disable-debug
 ac_add_options --enable-update-packaging
-ac_add_options --enable-optimize="-O2 -gstabs+"
+# Add explicit optimize flags in configure.in, not here - see bug 407794
+ac_add_options --enable-optimize
 ac_add_options --enable-official-branding
 ac_add_options --disable-tests
 ac_add_options --disable-shared
 ac_add_options --enable-static
-ac_add_options --enable-pango
 
 CC=/tools/gcc-4.1.1/bin/gcc
 CXX=/tools/gcc-4.1.1/bin/g++

tools/tinderbox-configs/thunderbird/macosx/CLOBBER

@@ -1 +1 @@
-385221, gcc 4 on PPC
+Clobbering to pick up bug 414515 mozconfig changes

tools/tinderbox-configs/thunderbird/macosx/mozconfig

@@ -3,6 +3,10 @@
 ## uname: Darwin bm-xserve09.build.mozilla.org 8.8.4 Darwin Kernel Version 8.8.4: Sun Oct 29 15:26:54 PST 2006; root:xnu-792.16.4.obj~1/RELEASE_I386 i386 i386
 #
 
+# symbols for breakpad
+export CFLAGS="-g -gfull"
+export CXXFLAGS="-g -gfull"
+
 . $topsrcdir/build/macosx/universal/mozconfig
 
 # Make flags
@@ -14,7 +18,8 @@ mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/../build/universal
 # Configure flags
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=nightly
-ac_add_options --enable-optimize="-O2 -g"
+# Add explicit optimize flags in configure.in, not here - see bug 407794
+ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --disable-tests
 ac_add_options --enable-official-branding

tools/tinderbox-configs/thunderbird/win32/CLOBBER

@@ -1 +1 @@
-Clobber for -- get this -- merge conflict on /README.txt
+Clobbering to pick up bug 414515 mozconfig changes

tools/tinderbox-configs/thunderbird/win32/mozconfig

@@ -3,19 +3,18 @@
 ## MINGW32_NT-5.2 TBNEWREF-WIN32- 1.0.11(0.46/3/2) 2007-01-12 12:05 i686 Msys
 #
 
-. $topsrcdir/mail/config/mozconfig
-
+mk_add_options MOZ_CO_PROJECT=mail
 mk_add_options MOZ_DEBUG_SYMBOLS=1
 mk_add_options MOZ_MAKE_FLAGS=-j1
 mk_add_options MOZ_CO_MODULE="mozilla/tools/update-packaging"
-mk_add_options MOZ_PACKAGE_NSIS=1
 
+ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=nightly
 ac_add_options --disable-debug
+# Add explicit optimize flags in configure.in, not here - see bug 407794
 ac_add_options --enable-optimize
 ac_add_options --disable-tests
 ac_add_options --enable-official-branding
-# ac_add_options --disable-auto-deps
 ac_add_options --disable-shared
 ac_add_options --enable-static
 ac_add_options --enable-update-packaging