Bug 652399 - Disable building embedded libjpeg-turbo when using system libjpeg. r=ted

This commit is contained in:
Mike Hommey 2011-05-09 07:38:34 +02:00
parent 159b405a12
commit af4e1e9ecf

View File

@ -4630,6 +4630,11 @@ if test "$SYSTEM_JPEG" = 1; then
#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
@ -4822,7 +4827,6 @@ 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=