# HG changeset patch
# User t_mrc-ct@user.sourceforge.jp
# Date 1371905600 -32400
# Branch GECKO17011esr_2013111808_RELBRANCH
# Node ID f7aeeecb1239812ee10440e010ac9ed9aaed42a2
# Parent  44a116de6f17a6ad02ee3fa8106499aa1eef50fe
adjust configure.in to tffx's configure.in

diff --git a/configure.in b/configure.in
--- a/configure.in
+++ b/configure.in
@@ -4162,19 +4162,19 @@
 _SAVE_CFLAGS=$CFLAGS
 _SAVE_LDFLAGS=$LDFLAGS
 _SAVE_LIBS=$LIBS
 
 dnl === TenFourFox issue 51
 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
     CFLAGS="-I${JPEG_DIR}/include $CFLAGS"
     LDFLAGS="-L${JPEG_DIR}/lib $LDFLAGS"
 fi
 if test -z "$JPEG_DIR" -o "$JPEG_DIR" = no; then
     MOZ_NATIVE_JPEG=
@@ -4195,17 +4195,17 @@
                    AC_MSG_ERROR([Insufficient JPEG library version for --with-system-jpeg]))
 fi 
 CFLAGS=$_SAVE_CFLAGS
 LDFLAGS=$_SAVE_LDFLAGS
 LIBS=$_SAVE_LIBS
 
 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
 
 if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$MOZ_NATIVE_JPEG" = 1; then
     MOZ_JPEG_CFLAGS="-I${JPEG_DIR}/include"
     MOZ_JPEG_LIBS="-L${JPEG_DIR}/lib ${MOZ_JPEG_LIBS}"
 fi
 
@@ -4560,19 +4560,19 @@
     TK_LIBS='$(MOZ_CAIRO_LIBS)'
     ;;
 
 cairo-cocoa)
     MOZ_WIDGET_TOOLKIT=cocoa
     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'
     MOZ_FS_LAYOUT=bundle
     ;;
 esac
 
 if test "$COMPILE_ENVIRONMENT"; then
@@ -5544,16 +5544,48 @@
 MOZ_ARG_ENABLE_BOOL(mobile-optimize,
 [  --enable-mobile-optimize   Enable mobile optimizations],
     MOZ_GFX_OPTIMIZE_MOBILE=1)
 
 if test "$MOZ_GFX_OPTIMIZE_MOBILE"; then
     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 ========================================================
 if test -z "$MOZ_OPTIMIZE_FLAGS"; then
 	MOZ_OPTIMIZE_FLAGS="-O"
 fi
 
 MOZ_ARG_ENABLE_STRING(optimize,
