aboutsummaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorEugene Sandulenko2005-01-06 15:50:41 +0000
committerEugene Sandulenko2005-01-06 15:50:41 +0000
commit27bf2ad5607145f5ebf50017b36c1c8fb1b3cc52 (patch)
tree75e8cbbb396640e9c36ab103f333fe668470bf92 /configure
parent12c44e85deaf94d5169fa2a8dd7f491f240b6e85 (diff)
downloadscummvm-rg350-27bf2ad5607145f5ebf50017b36c1c8fb1b3cc52.tar.gz
scummvm-rg350-27bf2ad5607145f5ebf50017b36c1c8fb1b3cc52.tar.bz2
scummvm-rg350-27bf2ad5607145f5ebf50017b36c1c8fb1b3cc52.zip
Fix bug #1097022 "ALL: Build fails on non-i386 archs if nasm is installed".
We should switch to nasm completely, though. svn-id: r16448
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure4
1 files changed, 3 insertions, 1 deletions
diff --git a/configure b/configure
index 6a4a52e8a7..c411e4cb0b 100755
--- a/configure
+++ b/configure
@@ -960,7 +960,9 @@ rm -f $TMPC $TMPO$EXEEXT
#
# Check for nasm
#
-CheckNASM
+if test "$_have_x86" = yes ; then
+ CheckNASM
+fi
if test "$_nasm" = yes ; then
_def_nasm='#define USE_NASM'