| author | Wolfgang Rosenauer <wr@rosenauer.org> |
| Mon, 20 Jul 2015 11:11:23 +0200 | |
| branch | firefox40 |
| changeset 869 | 0dd25a92df97 |
| parent 862 | 390088186660 |
| permissions | -rw-r--r-- |
| 869 | 1 |
# HG changeset patch |
2 |
# Parent af95b352f0be4eb2e337867450f25f4c2456a47f |
|
3 |
||
4 |
diff --git a/configure.in b/configure.in |
|
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 |
|
|
862
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
13 |
|
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
14 |
dnl If we're on an ARM system which supports libjpeg-turbo's asm routines and |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
15 |
dnl --disable-libjpeg-turbo wasn't passed, use the C compiler as the assembler. |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
16 |
-if test -n "$LIBJPEG_TURBO_ARM_ASM" ; then |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
17 |
+if test -n "$LIBJPEG_TURBO_ARM_ASM" -o -n "$LIBJPEG_TURBO_ARM64_ASM" ; then |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
18 |
echo "Using $AS as the assembler for ARM code." |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
19 |
LIBJPEG_TURBO_AS=$AS |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
20 |
fi |
| 869 | 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 |
|
|
862
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
25 |
AC_DEFINE(LIBJPEG_TURBO_X64_ASM) |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
26 |
elif test -n "$LIBJPEG_TURBO_ARM_ASM"; then |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
27 |
AC_DEFINE(LIBJPEG_TURBO_ARM_ASM) |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
28 |
+elif test -n "$LIBJPEG_TURBO_ARM64_ASM"; then |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
29 |
+ AC_DEFINE(LIBJPEG_TURBO_ARM64_ASM) |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
30 |
elif test -n "$MOZ_LIBJPEG_TURBO"; then |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
31 |
dnl Warn if we're not building the optimized routines, even though the user |
|
390088186660
mozilla-arm64-libjpeg-turbo.patch: fix libjpeg-turbo configuration
Andreas Schwab <schwab@suse.de>
parents:
diff
changeset
|
32 |
dnl didn't specify --disable-libjpeg-turbo. |
| 869 | 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 |