[Scummvm-cvs-logs] SF.net SVN: scummvm:[39615] scummvm/trunk/configure

[dhewg at users.sourceforge.net]

Revision: 39615
          http://scummvm.svn.sourceforge.net/scummvm/?rev=39615&view=rev
Author:   dhewg
Date:     2009-03-22 21:12:15 +0000 (Sun, 22 Mar 2009)

Log Message:
-----------
Don't just "return" from the script if  == no (leftover from r39541, where that code was inside a function)

Modified Paths:
--------------
    scummvm/trunk/configure

Modified: scummvm/trunk/configure
===================================================================
--- scummvm/trunk/configure	2009-03-22 19:26:49 UTC (rev 39614)
+++ scummvm/trunk/configure	2009-03-22 21:12:15 UTC (rev 39615)
@@ -1698,40 +1698,39 @@
 	echocheck "nasm"
 	if test "$_nasm" = no ; then
 		echo "disabled"
-		return;
-	fi
+	else
+		IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$SEPARATOR
 
-	IFS="${IFS= 	}"; ac_save_ifs="$IFS"; IFS=$SEPARATOR
+		for path_dir in $_nasmpath; do
+			if test -x "$path_dir/nasm$EXEEXT" ; then
+				NASM="$path_dir/nasm$EXEEXT"
+				echo $NASM
+				break
+			fi
+		done
 
-	for path_dir in $_nasmpath; do
-		if test -x "$path_dir/nasm$EXEEXT" ; then
-			NASM="$path_dir/nasm$EXEEXT"
-			echo $NASM
-			break
-		fi
-	done
+		IFS="$ac_save_ifs"
 
-	IFS="$ac_save_ifs"
-
-	if test x$NASM = x -o x$NASM = x'"$NASM"'; then
-		echo "not found"
-		_nasm=no
-	else
-		case $_host_os in
-			os2-emx*)
-				NASMFLAGS="-f aout"
-			;;
-			mingw* | cygwin*)
-				NASMFLAGS="-f win32"
-			;;
-			darwin*)
-				NASMFLAGS="-f macho"
-			;;
-			*)
-				NASMFLAGS="-f elf"
-			;;
-		esac
-		_nasm=yes
+		if test x$NASM = x -o x$NASM = x'"$NASM"'; then
+			echo "not found"
+			_nasm=no
+		else
+			case $_host_os in
+				os2-emx*)
+					NASMFLAGS="-f aout"
+				;;
+				mingw* | cygwin*)
+					NASMFLAGS="-f win32"
+				;;
+				darwin*)
+					NASMFLAGS="-f macho"
+				;;
+				*)
+					NASMFLAGS="-f elf"
+				;;
+			esac
+			_nasm=yes
+		fi
 	fi
 fi
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.