# HG changeset patch
# User t_mrc-ct@users.sourceforge.jp
# Date 1383310409 -32400
# Branch GECKO2401_2013101008_RELBRANCH
# Node ID e8a32acdd516f3577859a53f04f5a530df089325
# Parent  b7e493d99605752246a7b4db88aa9b9986a3453a
modifications for v24

diff --git a/config/config.mk b/config/config.mk
--- a/config/config.mk
+++ b/config/config.mk
@@ -412,20 +412,20 @@
 RTL_FLAGS=-MDd         # Dynamically linked, multithreaded MSVC4.0 debug RTL
 endif 
 endif # MOZ_DEBUG || NS_TRACE_MALLOC
 endif # USE_STATIC_LIBS
 endif # WINNT && !GNU_CC
 
 ifeq ($(OS_ARCH),Darwin)
 # Darwin doesn't cross-compile, so just set both types of flags here.
-HOST_CMFLAGS += -fobjc-exceptions
-HOST_CMMFLAGS += -fobjc-exceptions
-OS_COMPILE_CMFLAGS += -fobjc-exceptions
-OS_COMPILE_CMMFLAGS += -fobjc-exceptions
+HOST_CMFLAGS += -fobjc-exceptions -mno-altivec -mabi=no-altivec
+HOST_CMMFLAGS += -fobjc-exceptions -mno-altivec -mabi=no-altivec
+OS_COMPILE_CMFLAGS += -fobjc-exceptions -mno-altivec -mabi=no-altivec
+OS_COMPILE_CMMFLAGS += -fobjc-exceptions -mno-altivec -mabi=no-altivec
 endif
 
 COMPILE_CFLAGS	= $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CFLAGS) $(RTL_FLAGS) $(OS_CPPFLAGS) $(OS_COMPILE_CFLAGS)
 COMPILE_CXXFLAGS = $(STL_FLAGS) $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CXXFLAGS) $(RTL_FLAGS) $(OS_CPPFLAGS) $(OS_COMPILE_CXXFLAGS)
 COMPILE_CMFLAGS = $(OS_COMPILE_CMFLAGS)
 COMPILE_CMMFLAGS = $(OS_COMPILE_CMMFLAGS)
 
 ifndef CROSS_COMPILE
diff --git a/config/rules.mk b/config/rules.mk
--- a/config/rules.mk
+++ b/config/rules.mk
@@ -910,17 +910,17 @@
 # 2-second granularity
 	touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink
 endif
 else # !WINNT || GNU_CC
 	$(EXPAND_CCC) -o $@ $(CXXFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
 endif # WINNT && !GNU_CC
 
 ifdef ENABLE_STRIP
-	$(STRIP) $@
+	$(STRIP) $(STRIP_FLAGS) $@
 endif
 ifdef MOZ_POST_PROGRAM_COMMAND
 	$(MOZ_POST_PROGRAM_COMMAND) $@
 endif
 
 $(HOST_PROGRAM): $(HOST_PROGOBJS) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS)
 ifeq (_WINNT,$(GNU_CC)_$(HOST_OS_ARCH))
 	$(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $(HOST_OBJS) $(WIN32_EXE_LDFLAGS) $(HOST_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
@@ -963,17 +963,17 @@
 		rm -f $@.manifest; \
 	fi
 endif	# MSVC with manifest tool
 else
 	$(EXPAND_CCC) $(CXXFLAGS) -o $@ $< $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_GLUE_PROGRAM_LDFLAGS) $(WRAP_LDFLAGS) $(LIBS_DIR) $(LIBS) $(OS_LIBS) $(EXTRA_LIBS) $(BIN_FLAGS)
 endif # WINNT && !GNU_CC
 
 ifdef ENABLE_STRIP
-	$(STRIP) $@
+	$(STRIP) $(STRIP_FLAGS) $@
 endif
 ifdef MOZ_POST_PROGRAM_COMMAND
 	$(MOZ_POST_PROGRAM_COMMAND) $@
 endif
 
 $(HOST_SIMPLE_PROGRAMS): host_%$(HOST_BIN_SUFFIX): host_%.$(OBJ_SUFFIX) $(HOST_LIBS_DEPS) $(HOST_EXTRA_DEPS) $(GLOBAL_DEPS)
 ifeq (WINNT_,$(HOST_OS_ARCH)_$(GNU_CC))
 	$(HOST_LD) -NOLOGO -OUT:$@ -PDB:$(HOST_PDBFILE) $< $(WIN32_EXE_LDFLAGS) $(HOST_LIBS) $(HOST_EXTRA_LIBS)
@@ -1069,17 +1069,17 @@
 endif	# MSVC with manifest tool
 ifdef MOZ_PROFILE_GENERATE
 	touch -t `date +%Y%m%d%H%M.%S -d "now+5seconds"` pgo.relink
 endif
 endif	# WINNT && !GCC
 	@$(RM) foodummyfilefoo $(DELETE_AFTER_LINK)
 	chmod +x $@
 ifdef ENABLE_STRIP
-	$(STRIP) $@
+	$(STRIP) $(STRIP_FLAGS) $@
 endif
 ifdef MOZ_POST_DSO_LIB_COMMAND
 	$(MOZ_POST_DSO_LIB_COMMAND) $@
 endif
 
 ifeq ($(SOLARIS_SUNPRO_CC),1)
 _MDDEPFILE = $(MDDEPDIR)/$(@F).pp
 
diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -166,38 +166,16 @@
 fi
 
 case "$host_os" in
 mingw*)
     WIN_TOP_SRC=`cd $srcdir; pwd -W`
     ;;
 esac
 
-case "$target" in
-*-darwin*)
-    # What Tenfourbird tuned for
-    if test "$_SUBDIR_CC"
-    then
-     changequote(,)
-     TENFOURBIRD_TUNED="`echo "$_SUBDIR_CC" | sed -E -ne "s#.*[[:blank:]]-mtune='([[:alnum:]]+)'([[:blank:]].*)?\\$#\\1#p" -e 's#.*[[:blank:]]-mtune="([[:alnum:]]+)"([[:blank:]].*)?$#\1#p' -e 's#.*[[:blank:]]-mtune=([[:alnum:]]+)([[:blank:]].*)?$#\1#p' -e d`"
-     TENFOURBIRD_TUNED_NICKNAME="`echo "$TENFOURBIRD_TUNED" | sed -E -e 's/^([gG]3|740|750)$/G3/' -e 's/^([gG]4|7400)$/7400/' -e 's/^7450$/7450/' -e 's/^(G5|970)$/G5/'`"
-
-     changequote([,])
-
-     AC_DEFINE_UNQUOTED(TENFOURBIRD_TUNED,$TENFOURBIRD_TUNED)
-     AC_SUBST(TENFOURBIRD_TUNED)
-     AC_DEFINE_UNQUOTED(TENFOURBIRD_TUNED_NICKNAME,$TENFOURBIRD_TUNED_NICKNAME)
-     AC_SUBST(TENFOURBIRD_TUNED_NICKNAME)
-    fi # TENFOURBIRD_TUNED
-
-    MOZ_PKG_APPNAME=Tenfourbird
-    AC_SUBST(MOZ_PKG_APPNAME)
-    ;;
-esac
-
 # These lines do no useful work, but if we don't have them, then the output
 # configure script is really messed up.
 touch confdefs.pytmp
 AC_OUTPUT([])
 
 # Build the config.status for comm-central
 changequote(<<<,>>>)dnl
 : ${CONFIG_STATUS=./config.status}
diff --git a/mail/configure.in b/mail/configure.in
--- a/mail/configure.in
+++ b/mail/configure.in
@@ -139,8 +139,51 @@
     dnl The cache file needs to be an absolute path to work properly.
     cache_file_base=`dirname $cache_file`
     cache_file=`cd $cache_file_base && pwd`/`basename $cache_file`
 
     AC_OUTPUT_SUBDIRS(../ldap/sdks/c-sdk)
     ac_configure_args="$_save_ac_configure_args"
 fi # COMPILE_ENVIRONMENT && MOZ_LDAP_XPCOM
 
+
+dnl Tenfourbird specific configs.
+case "$target" in
+*-darwin*)
+    # What Tenfourbird tuned for
+    if test "$CC"
+    then
+        changequote(,)
+        TENFOURBIRD_TUNED="`echo "$CC" | sed -E -ne "s#.*[[:blank:]]-mtune='([[:alnum:]]+)'([[:blank:]].*)?\\$#\\1#p" -e 's#.*[[:blank:]]-mtune="([[:alnum:]]+)"([[:blank:]].*)?$#\1#p' -e 's#.*[[:blank:]]-mtune=([[:alnum:]]+)([[:blank:]].*)?$#\1#p' -e d | sed -E -e 's/^([gG]3|740|750)$/G3/' -e 's/^([gG]4|7400)$/7400/' -e 's/^7450$/7450/' -e 's/^([gG]5|970)$/G5/'`"
+        TENFOURBIRD_TUNED_NICKNAME="${TENFOURBIRD_TUNED}"
+
+        changequote([,])
+
+        AC_SUBST([TENFOURBIRD_TUNED])
+        AC_SUBST([TENFOURBIRD_TUNED_NICKNAME])
+
+        # XXX AC_DEFINE_UNQUOTED don't work because of error :-<
+
+        case "$TENFOURBIRD_TUNED_NICKNAME" in
+        G3)
+            AC_DEFINE([TENFOURBIRD_TUNED_NICKNAME],[G3])
+            AC_DEFINE([TENFOURBIRD_TUNED],[G3])
+            ;;
+        7400)
+            AC_DEFINE([TENFOURBIRD_TUNED_NICKNAME],[7400])
+            AC_DEFINE([TENFOURBIRD_TUNED],[7400])
+            ;;
+        7450)
+            AC_DEFINE([TENFOURBIRD_TUNED_NICKNAME],[7450])
+            AC_DEFINE([TENFOURBIRD_TUNED],[7450])
+            ;;
+        G5)
+            AC_DEFINE([TENFOURBIRD_TUNED_NICKNAME],[G5])
+            AC_DEFINE([TENFOURBIRD_TUNED],[G5])
+            ;;
+        esac
+
+    fi # TENFOURBIRD_TUNED
+
+    MOZ_PKG_APPNAME=Tenfourbird
+    AC_SUBST([MOZ_PKG_APPNAME])
+    ;;
+esac
\ No newline at end of file
