# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1404731380 -32400
# Branch GECKO3111_2014090813_RELBRANCH
# Node ID aa1731e8c5f888c809004761acfac4fd3616353f
# Parent  19ce137e2679c863bdfdb9c79c32cad1cb32fae2
fit to tffx mozcfg (modified for v31)

diff --git a/DEBUG.mozcfg b/DEBUG.mozcfg
--- a/DEBUG.mozcfg
+++ b/DEBUG.mozcfg
@@ -1,24 +1,26 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-crypto
 
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tbird-dbg
 
-CC="gcc-4.0 -arch ppc"
-CXX="g++-4.0 -arch ppc"
+export CC="/opt/local/bin/gcc-mp-4.6 -flax-vector-conversions"
+export CXX="/opt/local/bin/g++-mp-4.6 -flax-vector-conversions -fpermissive"
 mk_add_options MOZ_MAKE_FLAGS="-s -j2"
 mk_add_options AUTOCONF=autoconf213
-ac_add_options --disable-tests
+ac_add_options --enable-tests
 ac_add_options --disable-static
 ac_add_options --disable-crashreporter
-ac_add_options --disable-webrtc
+ac_add_options --without-intl-api
+ac_add_options --enable-webrtc
 ac_add_options --enable-optimize
 ac_add_options --disable-cpp-exceptions
 ac_add_options --enable-debug
+ac_add_options --enable-shark
 ac_add_options --enable-printing
 ac_add_options --enable-prebinding
 ac_add_options --enable-macos-target=10.4
 ac_add_options --enable-chrome-format=jar
 ac_add_options --enable-debug-symbols=-gdwarf-2
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
 ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
diff --git a/G3.mozcfg b/G3.mozcfg
--- a/G3.mozcfg
+++ b/G3.mozcfg
@@ -1,24 +1,26 @@
+#. $topsrcdir/mail/config/mozconfig
+
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-crypto
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tbird-g3
 
-export CC="/usr/bin/gcc-4.0 -arch ppc -O3 -mcpu=G3 -mtune=G3 -read_only_relocs suppress -mdynamic-no-pic"
-export CXX="/usr/bin/g++-4.0 -arch ppc -O3 -mcpu=G3 -mtune=G3 -read_only_relocs suppress -mdynamic-no-pic"
+export CC="/opt/local/bin/gcc-mp-4.6 -flax-vector-conversions -O3 -mcpu=G3 -mtune=G3 -read_only_relocs suppress -mdynamic-no-pic"
+export CXX="/opt/local/bin/g++-mp-4.6 -flax-vector-conversions -fpermissive -O3 -mcpu=G3 -mtune=G3 -read_only_relocs suppress -mdynamic-no-pic"
 mk_add_options MOZ_MAKE_FLAGS="-s -j2"
 mk_add_options AUTOCONF=autoconf213
 ac_add_options --disable-tests
 ac_add_options --disable-static
 ac_add_options --enable-optimize
 ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-debug
 ac_add_options --disable-crashreporter
 ac_add_options --enable-printing
 ac_add_options --enable-prebinding
 ac_add_options --enable-macos-target=10.4
 ac_add_options --enable-chrome-format=jar
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
 ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
-ac_add_options --disable-webrtc
+ac_add_options --enable-webrtc
diff --git a/G4-7400.mozcfg b/G4-7400.mozcfg
--- a/G4-7400.mozcfg
+++ b/G4-7400.mozcfg
@@ -1,15 +1,17 @@
+#. $topsrcdir/mail/config/mozconfig
+
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-crypto
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tbird-7400
 
-CC="/usr/bin/gcc-4.0 -arch ppc7400 -O3 -mcpu=7400 -mtune=7400 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -read_only_relocs suppress -mdynamic-no-pic"
-CXX="/usr/bin/g++-4.0 -arch ppc7400 -O3 -mcpu=7400 -mtune=7400 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -read_only_relocs suppress -mdynamic-no-pic"
+export CC="/opt/local/bin/gcc-mp-4.6 -flax-vector-conversions -O3 -mcpu=7400 -mtune=7400 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -read_only_relocs suppress -mdynamic-no-pic"
+export CXX="/opt/local/bin/g++-mp-4.6 -flax-vector-conversions -fpermissive -O3 -mcpu=7400 -mtune=7400 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -read_only_relocs suppress -mdynamic-no-pic"
 mk_add_options MOZ_MAKE_FLAGS="-s -j2"
 mk_add_options AUTOCONF=autoconf213
 ac_add_options --disable-tests
 ac_add_options --disable-static
 ac_add_options --disable-crashreporter
 ac_add_options --enable-optimize
 ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-debug
@@ -18,10 +20,10 @@
 ac_add_options --enable-macos-target=10.4
 ac_add_options --enable-chrome-format=jar
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
 ac_add_options --enable-tenfourfox-vmx
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
 ac_add_options --with-system-jpeg
 ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
-ac_add_options --disable-webrtc
+ac_add_options --enable-webrtc
 
diff --git a/G4-7450.mozcfg b/G4-7450.mozcfg
--- a/G4-7450.mozcfg
+++ b/G4-7450.mozcfg
@@ -1,15 +1,17 @@
+#. $topsrcdir/mail/config/mozconfig
+
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-crypto
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tbird-7450
 
-CC="/usr/bin/gcc-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=7450 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -read_only_relocs suppress -mdynamic-no-pic"
-CXX="/usr/bin/g++-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=7450 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -read_only_relocs suppress -mdynamic-no-pic"
+export CC="/opt/local/bin/gcc-mp-4.6 -flax-vector-conversions -O3 -mcpu=7450 -mtune=7450 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -read_only_relocs suppress -mdynamic-no-pic"
+export CXX="/opt/local/bin/g++-mp-4.6 -flax-vector-conversions -fpermissive -O3 -mcpu=7450 -mtune=7450 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -read_only_relocs suppress -mdynamic-no-pic"
 mk_add_options MOZ_MAKE_FLAGS="-s -j2"
 mk_add_options AUTOCONF=autoconf213
 ac_add_options --disable-tests
 ac_add_options --disable-static
 ac_add_options --enable-optimize
 ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-debug
 ac_add_options --disable-crashreporter
@@ -18,9 +20,9 @@
 ac_add_options --enable-macos-target=10.4
 ac_add_options --enable-chrome-format=jar
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
 ac_add_options --enable-tenfourfox-vmx
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
 ac_add_options --with-system-jpeg
 ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
-ac_add_options --disable-webrtc
+ac_add_options --enable-webrtc
diff --git a/G5.mozcfg b/G5.mozcfg
--- a/G5.mozcfg
+++ b/G5.mozcfg
@@ -1,27 +1,30 @@
+#. $topsrcdir/mail/config/mozconfig
+
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
 ac_add_options --enable-crypto
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tbird-g5
 
-CC="/usr/bin/gcc-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=G5 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -mmfcrf -mpowerpc-gpopt -read_only_relocs suppress -force_cpusubtype_ALL -mdynamic-no-pic -D_PPC970_"
-CXX="/usr/bin/g++-4.0 -arch ppc7450 -O3 -mcpu=7450 -mtune=G5 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -falign-loops-max-skip=15 -falign-jumps-max-skip=15 -mmfcrf -mpowerpc-gpopt -read_only_relocs suppress -force_cpusubtype_ALL -mdynamic-no-pic -D_PPC970_"
+export CC="/opt/local/bin/gcc-mp-4.6 -flax-vector-conversions -O3 -mcpu=7450 -mtune=G5 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -mmfcrf -mpowerpc-gpopt -read_only_relocs suppress -force_cpusubtype_ALL -mdynamic-no-pic -D_PPC970_"
+export CXX="/opt/local/bin/g++-mp-4.6 -flax-vector-conversions -fpermissive -O3 -mcpu=7450 -mtune=G5 -falign-loops=16 -falign-functions=16 -falign-labels=16 -falign-jumps=16 -mmfcrf -mpowerpc-gpopt -read_only_relocs suppress -force_cpusubtype_ALL -mdynamic-no-pic -D_PPC970_"
 mk_add_options MOZ_MAKE_FLAGS="-s -j2"
 mk_add_options AUTOCONF=autoconf213
 ac_add_options --disable-tests
 ac_add_options --disable-static
 ac_add_options --enable-optimize
 ac_add_options --disable-cpp-exceptions
 ac_add_options --disable-debug
 ac_add_options --disable-crashreporter
+ac_add_options --enable-webrtc
 ac_add_options --enable-printing
 ac_add_options --enable-prebinding
 ac_add_options --enable-macos-target=10.4
 ac_add_options --enable-chrome-format=jar
 ac_add_options --with-macos-sdk=/Developer/SDKs/MacOSX10.4u.sdk
 ac_add_options --enable-tenfourfox-vmx
 ac_add_options --enable-tenfourfox-g5
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
 ac_add_options --with-system-jpeg
 ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
-ac_add_options --disable-webrtc
+
