configure.ac |   10 +++++++++-
 1 files changed, 9 insertions(+), 1 deletions(-)

diff --git a/configure.ac b/configure.ac
index a138b32..9bf2efb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -190,7 +190,15 @@ dnl -----------------------
 # until we fix it, leave it disabled
 asm_support=no
 mmx_support=no
-if test "$ac_cv_prog_gcc" = yes; then
+
+check_for_mmx_support=yes
+AC_ARG_ENABLE(mmx,
+  [  --disable-mmx          disable compilation of MMX inline assembly ],
+  [if test x$enableval != xyes; then
+    check_for_mmx_support=no
+  fi])
+
+if test "$ac_cv_prog_gcc" = yes -a "$check_for_mmx_support" = yes; then
 
     # gcc-3.3 or newer complains about some of our stuff without this
     NOSTRICTALIASING="-fno-strict-aliasing"