Attachment #112174 for bug #169388

Lines 25060-25070 Link Here

(-)SDL-1.2.11.orig/configure (-1 / +1 lines)
25060	else	25060	else
25061	enable_nasm=yes	25061	enable_nasm=yes
25062	fi;	25062	fi;
25063	if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then	25063	if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
25064	# Extract the first word of "yasm", so it can be a program name with args.	25064	# Extract the first word of "yasm", so it can be a program name with args.
25065	set dummy yasm; ac_word=$2	25065	set dummy nasm; ac_word=$2
25066	echo "$as_me:$LINENO: checking for $ac_word" >&5	25066	echo "$as_me:$LINENO: checking for $ac_word" >&5
25067	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6	25067	echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6
25068	if test "${ac_cv_path_NASM+set}" = set; then	25068	if test "${ac_cv_path_NASM+set}" = set; then
25069	echo $ECHO_N "(cached) $ECHO_C" >&6	25069	echo $ECHO_N "(cached) $ECHO_C" >&6
25070	else	25070	else




    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, 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
            AC_DEFINE(SDL_HERMES_BLITTERS)
            SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
            if test x"$NASMFLAGS" = x; then
                case $ARCH in

Return to bug 169388

Lines 595-608 Link Here

(-)SDL-1.2.11.orig/configure.in (-4 / +1 lines)
595	dnl Check for NASM (for assembly blit routines)	595	dnl Check for NASM (for assembly blit routines)
596	AC_ARG_ENABLE(nasm,	596	AC_ARG_ENABLE(nasm,
597	AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]),	597	AC_HELP_STRING([--enable-nasm], [use nasm assembly blitters on x86 [[default=yes]]]),
598	, enable_nasm=yes)	598	, enable_nasm=yes)
599	if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then	599	if test x$enable_video = xyes -a x$enable_assembly = xyes -a x$enable_nasm = xyes; then
600	AC_PATH_PROG(NASM, yasm)	600	AC_PATH_PROG(NASM, nasm)
601	if test "x$NASM" = x -o "x$NASM" = x'"$NASM"'; then
602	AC_PATH_PROG(NASM, nasm)
603	fi
604	if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then	601	if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then
605	AC_DEFINE(SDL_HERMES_BLITTERS)	602	AC_DEFINE(SDL_HERMES_BLITTERS)
606	SOURCES="$SOURCES $srcdir/src/hermes/*.asm"	603	SOURCES="$SOURCES $srcdir/src/hermes/*.asm"
607	if test x"$NASMFLAGS" = x; then	604	if test x"$NASMFLAGS" = x; then
608	case $ARCH in	605	case $ARCH in