diff options
author | Andre Heider | 2009-03-22 21:12:15 +0000 |
---|---|---|
committer | Andre Heider | 2009-03-22 21:12:15 +0000 |
commit | 8f4831a1d9a535ffd90891f2024ca2139b50c13e (patch) | |
tree | d1dc1f3bc21a8923dfbfe0b35624215aebe95c4d /configure | |
parent | 2463b148a920d03bd67da59b63376b77063ed66b (diff) | |
download | scummvm-rg350-8f4831a1d9a535ffd90891f2024ca2139b50c13e.tar.gz scummvm-rg350-8f4831a1d9a535ffd90891f2024ca2139b50c13e.tar.bz2 scummvm-rg350-8f4831a1d9a535ffd90891f2024ca2139b50c13e.zip |
Don't just "return" from the script if == no (leftover from r39541, where that code was inside a function)
svn-id: r39615
Diffstat (limited to 'configure')
-rwxr-xr-x | configure | 61 |
1 files changed, 30 insertions, 31 deletions
@@ -1698,40 +1698,39 @@ if test "$_have_x86" = yes ; then echocheck "nasm" if test "$_nasm" = no ; then echo "disabled" - return; - fi - - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=$SEPARATOR + else + 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 |