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 4538 74b5387da0c4
parent 4442 31b0f2e06e3c
child 4539 d2517c0de52b
Debian patch: 011_no_yasm.diff
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"