View | Details | Raw Unified
Collapse All | Expand All

(-) SDL-1.2.11.orig/configure (-1 / +1 lines)
 Lines 25060-25070    Link Here  
else
else
  enable_nasm=yes
  enable_nasm=yes
fi;
fi;
    if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
    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.
        # 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 "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
if test "${ac_cv_path_NASM+set}" = set; then
if test "${ac_cv_path_NASM+set}" = set; then
  echo $ECHO_N "(cached) $ECHO_C" >&6
  echo $ECHO_N "(cached) $ECHO_C" >&6
else
else
(-) SDL-1.2.11.orig/configure.in (-4 / +1 lines)
 Lines 595-608    Link Here  
    dnl Check for NASM (for assembly blit routines)
    dnl Check for NASM (for assembly blit routines)
    AC_ARG_ENABLE(nasm,
    AC_ARG_ENABLE(nasm,
AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]),
AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]),
                  , enable_nasm=yes)
                  , enable_nasm=yes)
    if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
    if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
        AC_PATH_PROG(NASM, yasm)
 
        AC_PATH_PROG(NASM, nasm)
 
        if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then
 

            

            

              
            AC_PATH_PROG(NASM, nasm)

              

            

            

              
        fi

              

            

        
        if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
        if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then

        
            AC_DEFINE(SDL_HERMES_BLITTERS)
            AC_DEFINE(SDL_HERMES_BLITTERS)

        
            SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
            SOURCES="$SOURCES $srcdir/src/hermes/*.asm"

        
            if test x"$NASMFLAGS" = x; then
            if test x"$NASMFLAGS" = x; then

        
                case $ARCH in
                case $ARCH in