Backing out dc9cf2842794 (bug 652399) because it disables libjpeg-turbo on Windows (bug 675568). a=legneato GECKO60_2011072907_RELBRANCH
authorJustin Lebar <justin.lebar@gmail.com>
Mon, 01 Aug 2011 13:38:04 -0400
branchGECKO60_2011072907_RELBRANCH
changeset 70587 f83956d236214634c45d02f1767757bc751bf260
parent 70586 00f5ad57475c0e8e7f85999f6232d49d9bf7cef2
child 243118 f092aef8f41a8aa3a91b2720bc6b6a916bc44290
push id137
push userjlebar@mozilla.com
push dateMon, 01 Aug 2011 18:21:07 +0000
treeherdermozilla-beta@f83956d23621 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerslegneato
bugs652399, 675568
milestone6.0
Backing out dc9cf2842794 (bug 652399) because it disables libjpeg-turbo on Windows (bug 675568). a=legneato
configure.in
--- a/configure.in
+++ b/configure.in
@@ -4619,21 +4619,16 @@ if test "$SYSTEM_JPEG" = 1; then
     AC_TRY_COMPILE([ #include <stdio.h>
                      #include <sys/types.h>
                      #include <jpeglib.h> ],
                    [ #if JPEG_LIB_VERSION < $MOZJPEG
                      #error "Insufficient JPEG library version ($MOZJPEG required)."
                      #endif ],
                    SYSTEM_JPEG=1,
                    [SYSTEM_JPEG= JPEG_CFLAGS= JPEG_LIBS=]) 
-fi
-
-MOZ_LIBJPEG_TURBO=
-if test -z "$SYSTEM_JPEG"; then
-    MOZ_LIBJPEG_TURBO=1
 fi 
 CFLAGS=$_SAVE_CFLAGS
 LDFLAGS=$_SAVE_LDFLAGS
 LIBS=$_SAVE_LIBS
 
 if test -n "${JPEG_DIR}" -a -d "${JPEG_DIR}" -a "$SYSTEM_JPEG" = 1; then
     JPEG_CFLAGS="-I${JPEG_DIR}/include"
     JPEG_LIBS="-L${JPEG_DIR}/lib ${JPEG_LIBS}"
@@ -4815,16 +4810,17 @@ MOZ_MEDIA=
 MOZ_WEBM=1
 VPX_AS=
 VPX_ASFLAGS=
 VPX_AS_DASH_C_FLAG=
 VPX_AS_CONVERSION=
 VPX_ASM_SUFFIX=
 VPX_X86_ASM=
 VPX_ARM_ASM=
+MOZ_LIBJPEG_TURBO=1
 LIBJPEG_TURBO_AS=
 LIBJPEG_TURBO_ASFLAGS=
 LIBJPEG_TURBO_X86_ASM=
 LIBJPEG_TURBO_X64_ASM=
 MOZ_PANGO=1
 MOZ_PERMISSIONS=1
 MOZ_PLACES=1
 MOZ_PREF_EXTENSIONS=1