Sophie

Sophie

distrib > Mandriva > 2007.1 > x86_64 > by-pkgid > 66ca59f7b5a851d90f009e26f4553155 > files > 15

SDL12-1.2.11-7mdv2007.1.src.rpm

Index: libsdl1.2-1.2.11/configure.in
===================================================================
--- libsdl1.2-1.2.11.orig/configure.in	2006-07-19 15:29:05.000000000 +0200
+++ libsdl1.2-1.2.11/configure.in	2006-07-19 15:29:11.000000000 +0200
@@ -597,10 +597,7 @@
 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"
--- SDL-1.2.11/configure~	2006-07-24 18:30:23.000000000 +0200
+++ SDL-1.2.11/configure	2006-07-24 18:33:03.000000000 +0200
@@ -25062,7 +25062,7 @@ else
 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