# HG changeset patch # User Sam Lantinga # Date 1279464840 25200 # Node ID 74b5387da0c4ebbd04118f916856ea2296aacae6 # Parent 31b0f2e06e3c1f630776c613ea57b66a0caa8e95 Debian patch: 011_no_yasm.diff diff -r 31b0f2e06e3c -r 74b5387da0c4 configure.in --- a/configure.in Sun Apr 25 20:16:38 2010 -0400 +++ b/configure.in Sun Jul 18 07:54:00 2010 -0700 @@ -745,16 +745,12 @@ esac fi - AC_PATH_PROG(NASM, yasm) + AC_PATH_PROG(NASM, nasm) echo "%ifidn __OUTPUT_FORMAT__,elf" > unquoted-sections echo "section .note.GNU-stack noalloc noexec nowrite progbits" >> unquoted-sections echo "%endif" >> unquoted-sections CompileNASM unquoted-sections || NASM="" - if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then - $as_unset ac_cv_path_NASM - AC_PATH_PROG(NASM, nasm) - fi if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then AC_DEFINE(SDL_HERMES_BLITTERS) SOURCES="$SOURCES $srcdir/src/hermes/*.asm"