diff options
| author | Rodger Combs <rodger.combs@gmail.com> | 2017-06-20 23:10:34 -0500 |
|---|---|---|
| committer | Rodger Combs <rodger.combs@gmail.com> | 2017-09-05 20:43:09 -0500 |
| commit | 59d6dde68a887c0a4f738d59dc560608117a3357 (patch) | |
| tree | 1fa0a147148340eb070a80a3764c18c7403da794 /configure.ac | |
| parent | 6092e276de387133de4dfb17843a5d8d0b8de3f0 (diff) | |
| download | libass-59d6dde68a887c0a4f738d59dc560608117a3357.tar.bz2 libass-59d6dde68a887c0a4f738d59dc560608117a3357.tar.xz | |
configure: cleanup in preparation for x86inc update and switch to nasm
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 36 |
1 files changed, 20 insertions, 16 deletions
diff --git a/configure.ac b/configure.ac index 9345111..d4c3f3b 100644 --- a/configure.ac +++ b/configure.ac @@ -61,33 +61,23 @@ AS_IF([test x$enable_asm != xno], [ AS=yasm X86=true BITS=32 - ASFLAGS="$ASFLAGS -DARCH_X86_64=0 -m x86" ], + BITTYPE=32 + ASFLAGS="$ASFLAGS -DARCH_X86_64=0" ], [x86_64-*-gnux32|amd64-*-gnux32], [ AS=yasm INTEL=true X64=true BITS=64 - ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m x32" ], + BITTYPE=x32 + ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -DPIC" ], [x86_64-*|amd64-*], [ AS=yasm INTEL=true X64=true BITS=64 - ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -m amd64" ], + BITTYPE=64 + ASFLAGS="$ASFLAGS -DARCH_X86_64=1 -DPIC" ], ) - AS_CASE([$host], - [*darwin*], [ - ASFLAGS="$ASFLAGS -f macho$BITS -DPREFIX -DHAVE_ALIGNED_STACK=1" ], - [*linux*|*dragonfly*|*bsd*|*solaris*], [ - ASFLAGS="$ASFLAGS -f elf -DHAVE_ALIGNED_STACK=1" ], - [*cygwin*|*mingw*], [ - ASFLAGS="$ASFLAGS -f win$BITS" - AS_IF([test x$BITS = x64], [ - ASFLAGS="$ASFLAGS -DHAVE_ALIGNED_STACK=1" - ], [ - ASFLAGS="$ASFLAGS -DHAVE_ALIGNED_STACK=0 -DPREFIX" - ]) - ]) AS_IF([test x$INTEL = xtrue], [ AC_CHECK_PROG([yasm_check], [$AS], [yes]) AS_IF([test x$yasm_check != xyes], [ @@ -95,6 +85,20 @@ AS_IF([test x$enable_asm != xno], [ AC_MSG_WARN(Install yasm for a significantly faster libass build.) enable_asm=no ], [ + AS_CASE([$host], + [*darwin*], [ + ASFLAGS="$ASFLAGS -f macho$BITTYPE -DPREFIX -DHAVE_ALIGNED_STACK=1" ], + [*linux*|*dragonfly*|*bsd*|*solaris*], [ + ASFLAGS="$ASFLAGS -f elf$BITTYPE -DHAVE_ALIGNED_STACK=1" ], + [*cygwin*|*mingw*], [ + ASFLAGS="$ASFLAGS -f win$BITTYPE" + AS_IF([test x$BITS = x64], [ + ASFLAGS="$ASFLAGS -DHAVE_ALIGNED_STACK=1" + ], [ + ASFLAGS="$ASFLAGS -DHAVE_ALIGNED_STACK=0 -DPREFIX" + ]) + ]) + ASFLAGS="$ASFLAGS -DHAVE_CPUNOP=0 -Dprivate_prefix=ass" AC_MSG_CHECKING([if $AS supports vpmovzxwd]) echo "vpmovzxwd ymm0, xmm0" > conftest.asm AS_IF([$AS conftest.asm $ASFLAGS -o conftest.o >conftest.log 2>&1], [ |