Adapt Thunderbird and SeaMonkey mozconfigs for latest universal config changes on trunk. r=KaiRo
authorMark Banner <bugzilla@standard8.plus.com>
Fri, 19 Mar 2010 14:37:18 +0000
changeset 2190 9ecf99e68b31828e65602b81c8f28396eb22b33b
parent 2189 2e782932a01cef1673d1d6bdbd13c59b605326ea
child 2191 910bbd48c94e5c64310c716587fa07006555059c
push id1673
push userbugzilla@standard8.plus.com
push dateFri, 19 Mar 2010 14:37:32 +0000
reviewersKaiRo
Adapt Thunderbird and SeaMonkey mozconfigs for latest universal config changes on trunk. r=KaiRo
seamonkey/macosx/comm-central-trunk/dep/mozconfig
seamonkey/macosx/comm-central-trunk/nightly/mozconfig
seamonkey/macosx/comm-central-trunk/release/mozconfig
thunderbird/macosx/comm-central/nightly/mozconfig
--- a/seamonkey/macosx/comm-central-trunk/dep/mozconfig
+++ b/seamonkey/macosx/comm-central-trunk/dep/mozconfig
@@ -1,12 +1,19 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-else
+  # We need some hackery to deal with the mozilla/ build system calling this
+  # mozconfig.
+  oldtopsrcdir=$topsrcdir
+  export topsrcdir=$topsrcdir/mozilla
+fi
+
 . $topsrcdir/build/macosx/universal/mozconfig
+
+if test -n $oldtopsrcdir; then
+  export topsrcdir=$oldtopsrcdir
 fi
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-codesighs
 ac_add_options --disable-install-strip
 
--- a/seamonkey/macosx/comm-central-trunk/nightly/mozconfig
+++ b/seamonkey/macosx/comm-central-trunk/nightly/mozconfig
@@ -1,12 +1,19 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-else
+  # We need some hackery to deal with the mozilla/ build system calling this
+  # mozconfig.
+  oldtopsrcdir=$topsrcdir
+  export topsrcdir=$topsrcdir/mozilla
+fi
+
 . $topsrcdir/build/macosx/universal/mozconfig
+
+if test -n $oldtopsrcdir; then
+  export topsrcdir=$oldtopsrcdir
 fi
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 # static build with tests is not supported (e.g. in crashreporter)
 ac_add_options --disable-tests
 ac_add_options --enable-codesighs
--- a/seamonkey/macosx/comm-central-trunk/release/mozconfig
+++ b/seamonkey/macosx/comm-central-trunk/release/mozconfig
@@ -1,12 +1,19 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-else
+  # We need some hackery to deal with the mozilla/ build system calling this
+  # mozconfig.
+  oldtopsrcdir=$topsrcdir
+  export topsrcdir=$topsrcdir/mozilla
+fi
+
 . $topsrcdir/build/macosx/universal/mozconfig
+
+if test -n $oldtopsrcdir; then
+  export topsrcdir=$oldtopsrcdir
 fi
 
 ac_add_options --enable-application=suite
 ac_add_options --enable-update-channel=beta
 ac_add_options --enable-update-packaging
 # static build with tests is not supported (e.g. in crashreporter)
 ac_add_options --disable-tests
 #ac_add_options --with-branding=suite/branding/unofficial
--- a/thunderbird/macosx/comm-central/nightly/mozconfig
+++ b/thunderbird/macosx/comm-central/nightly/mozconfig
@@ -1,12 +1,19 @@
 if test -e "$topsrcdir/mozilla/build/macosx/universal/mozconfig"; then
-. $topsrcdir/mozilla/build/macosx/universal/mozconfig
-else
+  # We need some hackery to deal with the mozilla/ build system calling this
+  # mozconfig.
+  oldtopsrcdir=$topsrcdir
+  export topsrcdir=$topsrcdir/mozilla
+fi
+
 . $topsrcdir/build/macosx/universal/mozconfig
+
+if test -n $oldtopsrcdir; then
+  export topsrcdir=$oldtopsrcdir
 fi
 
 ac_add_options --enable-application=mail
 ac_add_options --enable-update-channel=nightly
 ac_add_options --enable-update-packaging
 ac_add_options --enable-optimize
 ac_add_options --disable-debug
 ac_add_options --disable-tests