From 071cfd26ab8671310f8b334cadda577da8f32cd7 Mon Sep 17 00:00:00 2001 From: Sam Lantinga Date: Sun, 18 Jul 2010 07:54:00 -0700 Subject: [PATCH] Debian patch: 011_no_yasm.diff --- configure.in | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/configure.in b/configure.in index b99c1868b..a4a344ad5 100644 --- a/configure.in +++ b/configure.in @@ -745,16 +745,12 @@ AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes 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"