1 Index: mozilla/configure.in |
1 # HG changeset patch |
2 =================================================================== |
2 # Parent af95b352f0be4eb2e337867450f25f4c2456a47f |
3 --- mozilla.orig/configure.in |
3 |
4 +++ mozilla/configure.in |
4 diff --git a/configure.in b/configure.in |
5 @@ -6241,7 +6241,7 @@ fi |
5 --- a/configure.in |
|
6 +++ b/configure.in |
|
7 @@ -6202,27 +6202,29 @@ if test -n "$LIBJPEG_TURBO_X86_ASM" -o - |
|
8 if test "$_YASM_MAJOR_VERSION" -lt "1" -o \( "$_YASM_MAJOR_VERSION" -eq "1" -a "$_YASM_MINOR_VERSION" -lt "1" \) ; then |
|
9 AC_MSG_ERROR([Yasm 1.1 or greater is required to build with libjpeg-turbo's optimized JPEG decoding routines, but you appear to have version $_YASM_MAJOR_VERSION.$_YASM_MINOR_VERSION. Upgrade to the newest version or configure with --disable-libjpeg-turbo to use the pure C JPEG decoder. See https://developer.mozilla.org/en/YASM for more details.]) |
|
10 fi |
|
11 fi |
|
12 fi |
6 |
13 |
7 dnl If we're on an ARM system which supports libjpeg-turbo's asm routines and |
14 dnl If we're on an ARM system which supports libjpeg-turbo's asm routines and |
8 dnl --disable-libjpeg-turbo wasn't passed, use the C compiler as the assembler. |
15 dnl --disable-libjpeg-turbo wasn't passed, use the C compiler as the assembler. |
9 -if test -n "$LIBJPEG_TURBO_ARM_ASM" ; then |
16 -if test -n "$LIBJPEG_TURBO_ARM_ASM" ; then |
10 +if test -n "$LIBJPEG_TURBO_ARM_ASM" -o -n "$LIBJPEG_TURBO_ARM64_ASM" ; then |
17 +if test -n "$LIBJPEG_TURBO_ARM_ASM" -o -n "$LIBJPEG_TURBO_ARM64_ASM" ; then |
11 echo "Using $AS as the assembler for ARM code." |
18 echo "Using $AS as the assembler for ARM code." |
12 LIBJPEG_TURBO_AS=$AS |
19 LIBJPEG_TURBO_AS=$AS |
13 fi |
20 fi |
14 @@ -6252,6 +6252,8 @@ elif test -n "$LIBJPEG_TURBO_X64_ASM"; t |
21 |
|
22 if test -n "$LIBJPEG_TURBO_X86_ASM"; then |
|
23 AC_DEFINE(LIBJPEG_TURBO_X86_ASM) |
|
24 elif test -n "$LIBJPEG_TURBO_X64_ASM"; then |
15 AC_DEFINE(LIBJPEG_TURBO_X64_ASM) |
25 AC_DEFINE(LIBJPEG_TURBO_X64_ASM) |
16 elif test -n "$LIBJPEG_TURBO_ARM_ASM"; then |
26 elif test -n "$LIBJPEG_TURBO_ARM_ASM"; then |
17 AC_DEFINE(LIBJPEG_TURBO_ARM_ASM) |
27 AC_DEFINE(LIBJPEG_TURBO_ARM_ASM) |
18 +elif test -n "$LIBJPEG_TURBO_ARM64_ASM"; then |
28 +elif test -n "$LIBJPEG_TURBO_ARM64_ASM"; then |
19 + AC_DEFINE(LIBJPEG_TURBO_ARM64_ASM) |
29 + AC_DEFINE(LIBJPEG_TURBO_ARM64_ASM) |
20 elif test -n "$MOZ_LIBJPEG_TURBO"; then |
30 elif test -n "$MOZ_LIBJPEG_TURBO"; then |
21 dnl Warn if we're not building the optimized routines, even though the user |
31 dnl Warn if we're not building the optimized routines, even though the user |
22 dnl didn't specify --disable-libjpeg-turbo. |
32 dnl didn't specify --disable-libjpeg-turbo. |
|
33 AC_MSG_WARN([No assembler or assembly support for libjpeg-turbo. Using unoptimized C routines.]) |
|
34 fi |
|
35 |
|
36 dnl ======================================================== |
|
37 dnl = Enable compilation of specific extension modules |