--- configure.x	2005-04-24 10:40:41.000000000 +0200
+++ configure	2005-04-24 14:22:54.007165934 +0200
@@ -371,6 +371,7 @@
 _cc=cc
 test "$CC" && _cc="$CC"
 _as=auto
+_nasm=auto
 _runtime_cpudetection=no
 for ac_option do
   case "$ac_option" in
@@ -386,6 +387,9 @@
   --as=*)
     _as=`echo $ac_option | cut -d '=' -f 2`
     ;;
+  --nasm=*)
+    _nasm=`echo $ac_option | cut -d '=' -f 2`
+    ;;
   --enable-gcc-checking)
     _skip_cc_check=no
     ;;
@@ -684,6 +688,21 @@
   test -z "$_as" && _as=as
 fi
 
+echocheck "nasm"
+if test "$_nasm" = auto ; then
+  _nasm="nasm"
+  echo "$_nasm -v" >> "$TMPLOG" 2>&1
+  $_nasm -v >> "$TMPLOG" 2>&1
+  if test $? ; then
+    echores $_nasm
+  else
+    _nasm=
+    echores "not installed"
+  fi
+else
+  echores $_nasm
+fi
+
 # XXX: this should be ok..
 _cpuinfo="echo"
 # Cygwin has /proc/cpuinfo, but only supports Intel CPUs
@@ -5881,7 +5900,7 @@
 fi
 
 echocheck "x264"
-if test "$_x264" == yes && test "$_pthreads" == yes ; then
+if test "$_x264" == yes && test "$_pthreads" == yes && test -n "$_nasm" ; then
   _inc_x264="-I../x264"
   _def_x264='#define HAVE_X264 1'
   _codecmodules="x264 $_codecmodules"
@@ -6624,6 +6643,7 @@
 #AR = ar
 CC = $_cc
 HOST_CC = $_host_cc
+NASM = $_nasm
 AWK = $_awk
 RANLIB = $_ranlib
 INSTALL = $_install