# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1387283057 -32400
# Branch GECKO2470_2014071714_RELBRANCH
# Node ID 0099aeb427c577b321bb3834e20a66ae8d5ca114
# Parent  831badea0be86158ff2c11aaad67153bbaf95887
fix langpack build error

diff --git a/LANGPACK.mozcfg b/LANGPACK.mozcfg
--- a/LANGPACK.mozcfg
+++ b/LANGPACK.mozcfg
@@ -1,24 +1,28 @@
 ac_add_options --enable-application=mail
 ac_add_options --enable-calendar
+ac_add_options --enable-crypto
 mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/obj-tbird-langpack
 
-ac_add_options --disable-compile-environment
+#ac_add_options --disable-compile-environment
 ac_add_options --with-l10n-base=$topsrcdir/../l10n-release
 
+export CC="/opt/local/bin/gcc-mp-4.6 -flax-vector-conversions -read_only_relocs suppress -mdynamic-no-pic"
+export CXX="/opt/local/bin/g++-mp-4.6 -flax-vector-conversions -fpermissive -read_only_relocs suppress -mdynamic-no-pic"
+
 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-tenfourfox-vmx
-ac_add_options --enable-tenfourfox-g5
 ac_add_options --enable-strip
 ac_add_options --enable-install-strip
+ac_add_options --with-distribution-id=jp.sourceforge.tenfourbird
+ac_add_options --enable-webrtc
 ac_add_options --with-system-jpeg
diff --git a/mail/configure.in b/mail/configure.in
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -167,16 +167,23 @@
             AC_DEFINE([TENFOURBIRD_TUNED],[7400])
             ;;
         7450)
             AC_DEFINE([TENFOURBIRD_TUNED],[7450])
             ;;
         G5)
             AC_DEFINE([TENFOURBIRD_TUNED],[G5])
             ;;
+        "")
+            AC_DEFINE([TENFOURBIRD_TUNED],[])
+            ;;
+        *)
+            echo "Unknown gcc -mtune : ${TENFOURBIRD_TUNED}" 1>&2
+            exit 1
+            ;;
         esac
 
     fi # TENFOURBIRD_TUNED
 
     MOZ_PKG_APPNAME=Tenfourbird
     AC_SUBST([MOZ_PKG_APPNAME])
     ;;
 esac
\ No newline at end of file
