diff --git a/src/modules/Image/configure.in b/src/modules/Image/configure.in
index 462cfa8b428dd78a7567cfb44d35bb903bf515bc..dccb6d69dcab4d33eee5f08b0c779c63d3f83170 100644
--- a/src/modules/Image/configure.in
+++ b/src/modules/Image/configure.in
@@ -1,4 +1,4 @@
-# $Id: configure.in,v 1.13 2000/05/29 09:58:24 per Exp $
+# $Id: configure.in,v 1.14 2000/07/14 21:23:10 grubba Exp $
 AC_INIT(image.c)
 AC_CONFIG_HEADER(image_machine.h)
 
@@ -20,9 +20,14 @@ ASSEMBLY_OBJECTS=""
 AC_MSG_CHECKING( [if nasm can be used] )
 
 if nasm -f elf -o assembly.o $srcdir/assembly.s ; then
-  ASSEMBLY_OBJECTS=assembly.o
-  AC_DEFINE(ASSEMBLY_OK)
-  AC_MSG_RESULT(yes)
+  # nasm/ia64 can compile ia32 code...
+  if test "`uname -m`" = "ia64"; then
+    AC_MSG_RESULT([yes, but we are on an IA64 machine])
+  else
+    ASSEMBLY_OBJECTS=assembly.o
+    AC_DEFINE(ASSEMBLY_OK)
+    AC_MSG_RESULT(yes)
+  fi
 else
   AC_MSG_RESULT(no)
 fi