Debian patch: 011_no_yasm.diff SDL-1.2
authorSam Lantinga <slouken@libsdl.org>
Sun, 18 Jul 2010 07:54:00 -0700
branchSDL-1.2
changeset 453874b5387da0c4
parent 4442 31b0f2e06e3c
child 4539 d2517c0de52b
Debian patch: 011_no_yasm.diff
configure.in
     1.1 --- a/configure.in	Sun Apr 25 20:16:38 2010 -0400
     1.2 +++ b/configure.in	Sun Jul 18 07:54:00 2010 -0700
     1.3 @@ -745,16 +745,12 @@
     1.4              esac
     1.5          fi
     1.6  
     1.7 -        AC_PATH_PROG(NASM, yasm)
     1.8 +        AC_PATH_PROG(NASM, nasm)
     1.9          echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections
    1.10          echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections
    1.11          echo "%endif" >> unquoted-sections
    1.12          CompileNASM unquoted-sections || NASM=""
    1.13  
    1.14 -        if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then
    1.15 -            $as_unset ac_cv_path_NASM
    1.16 -            AC_PATH_PROG(NASM, nasm)
    1.17 -        fi
    1.18          if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
    1.19              AC_DEFINE(SDL_HERMES_BLITTERS)
    1.20              SOURCES="$SOURCES $srcdir/src/hermes/*.asm"