# HG changeset patch
# User t_mrc-ct@user.sourceforge.jp
# Date 1371905600 -32400
# Branch GECKO1708_2013080114_RELBRANCH
# Node ID 4b4db5828639297092acd4480714d0afc043362e
# Parent  bb75605f86edfee821a89696300cb8b9d523e11a
adjust configure.in to tffx's configure.in

diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -4167,9 +4167,9 @@
 if test -z "$MOZ_SYSTEM_JPEG" -a "${JPEG_DIR}" = "yes"; then
         echo "Using OS X native libjpeg"
         JPEG_DIR="/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ImageIO.framework/Resources"
-        CFLAGS="-I${topsrcdir}/mozilla/jpeg-imageio $CFLAGS"
+        CFLAGS="-I${MOZILLA_SRCDIR}/jpeg-imageio $CFLAGS"
         LDFLAGS="-L${JPEG_DIR} $LDFLAGS"
-        AC_CHECK_LIB(JPEG, _cg_jpeg_destroy_compress, [MOZ_NATIVE_JPEG=1 MOZ_JPEG_LIBS="-L/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ImageIO.framework/Resources -lJPEG" JPEG_CFLAGS="-I${topsrcdir}/mozilla/jpeg-imageio"], MOZ_NATIVE_JPEG=)
+        AC_CHECK_LIB(JPEG, _cg_jpeg_destroy_compress, [MOZ_NATIVE_JPEG=1 MOZ_JPEG_LIBS="-L/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ImageIO.framework/Resources -lJPEG" JPEG_CFLAGS="-I${MOZILLA_SRCDIR}/jpeg-imageio"], MOZ_NATIVE_JPEG=)
 else
 
 if test -n "${JPEG_DIR}" -a "${JPEG_DIR}" != "yes"; then
@@ -4200,7 +4200,7 @@
 
 dnl === TenFourFox issue 51
 if test "$MOZ_NATIVE_JPEG" = 1 -a "${JPEG_DIR}" = "/System/Library/Frameworks/ApplicationServices.framework/Frameworks/ImageIO.framework/Resources"; then
- MOZ_JPEG_CFLAGS="-I${topsrcdir}/mozilla/jpeg-imageio"
+ MOZ_JPEG_CFLAGS="-I${MOZILLA_SRCDIR}/jpeg-imageio"
  MOZ_JPEG_LIBS="-L${JPEG_DIR} ${MOZ_JPEG_LIBS}"
 else
 
@@ -4565,9 +4565,9 @@
     AC_DEFINE(MOZ_WIDGET_COCOA)
     MOZ_USER_DIR="Mozilla"
     AC_DEFINE(XP_MACOSX)
-    TK_LIBS='-framework QuartzCore -framework Carbon -framework AddressBook'
+    TK_LIBS='-framework QuartzCore -framework Carbon -framework AddressBook -framework ApplicationServices'
     TK_CFLAGS="-DNO_X11"
-    LDFLAGS="$LDFLAGS -framework Cocoa -lobjc"
+    LDFLAGS="$LDFLAGS -framework Cocoa -lobjc -framework ApplicationServices"
     CFLAGS="$CFLAGS $TK_CFLAGS"
     CXXFLAGS="$CXXFLAGS $TK_CFLAGS"
     LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL'
@@ -5549,6 +5549,38 @@
     AC_DEFINE(MOZ_GFX_OPTIMIZE_MOBILE)
 fi
 
+dnl ==================================
+dnl AltiVec/VMX specific optimizations
+dnl ==================================
+MOZ_ARG_ENABLE_BOOL(tenfourfox-vmx,
+[  --enable-tenfourfox-vmx
+                  Turn on AltiVec-VMX specific options for TenFourFox(Tenfourbird)],
+    TENFOURFOX_VMX=1)
+
+AC_SUBST(TENFOURFOX_VMX)
+
+if test "$TENFOURFOX_VMX"; then
+    AC_DEFINE(TENFOURFOX_VMX)
+    VPX_VMX_ASM=1
+    AC_DEFINE(VPX_VMX_ASM)
+fi
+
+AC_SUBST(VPX_VMX_ASM)
+
+dnl =========================
+dnl G5 specific optimizations
+dnl =========================
+MOZ_ARG_ENABLE_BOOL(tenfourfox-g5,
+[  --enable-tenfourfox-g5
+                  Turn on G5 specific options for TenFourFox(Tenfourbird)],
+    TENFOURFOX_G5=1)
+
+AC_SUBST(TENFOURFOX_G5)
+
+if test "$TENFOURFOX_G5"; then
+    AC_DEFINE(TENFOURFOX_G5)
+fi
+
 dnl ========================================================
 dnl = Enable code optimization. ON by default.
 dnl ========================================================
