[patch] libsdl-1.2.11-no-yasm.patch

libsdl-1.2.11-no-yasm.patch (text/plain), 1.67 KB, created by Peter Alfredsen (RETIRED) on 2007-03-05 16:00:53 UTC

From Mandriva. Realigned for Gentoo by Peter Alfredsen

diff -U5 SDL-1.2.11.orig/configure SDL-1.2.11/configure
--- SDL-1.2.11.orig/configure   2006-06-27 06:48:54.000000000 +0200
+++ SDL-1.2.11/configure        2007-03-05 16:17:09.000000000 +0100
@@ -25060,11 +25060,11 @@
 else
   enable_nasm=yes
 fi;
     if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
         # Extract the first word of "yasm", so it can be a program name with args.
-set dummy yasm; ac_word=$2
+set dummy nasm; ac_word=$2
 echo "$as_me:$LINENO: checking for $ac_word" >&5
 echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
 if test "${ac_cv_path_NASM+set}" = set; then
   echo $ECHO_N "(cached) $ECHO_C" >&6
 else
Only in SDL-1.2.11/: configure~
diff -U5 SDL-1.2.11.orig/configure.in SDL-1.2.11/configure.in
--- SDL-1.2.11.orig/configure.in        2007-03-05 16:10:28.000000000 +0100
+++ SDL-1.2.11/configure.in     2007-03-05 16:19:46.000000000 +0100
@@ -595,14 +595,11 @@
     dnl Check for NASM (for assembly blit routines)
     AC_ARG_ENABLE(nasm,
 AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]),
                   , enable_nasm=yes)
     if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
-        AC_PATH_PROG(NASM, yasm)
-        if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then
-            AC_PATH_PROG(NASM, nasm)
-        fi
+        AC_PATH_PROG(NASM, nasm)
         if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
             AC_DEFINE(SDL_HERMES_BLITTERS)
             SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
             if test x"$NASMFLAGS" = x; then
                 case $ARCH in