Index: configure
===================================================================
--- configure   (revision 21216)
+++ configure   (working copy)
@@ -690,7 +690,7 @@
       cc_version="v. ?.??, bad"
       cc_verc_fail=yes
       ;;
-    8.0)
+    8.0|9.1)
       cc_version="$cc_version, ok"
       cc_verc_fail=no
       ;;
@@ -1423,6 +1423,15 @@
     _optimizing=''
     ;;

+  generic)
+    _def_arch='#define ARCH_GENERIC 1'
+    _target_arch='TARGET_ARCH_GENERIC = yes'
+    iproc=''
+    proc=''
+    _march=''
+    _mcpu=''
+    _optimizing=''
+    ;;
   *)
     echo "The architecture of your CPU ($host_arch) is not supported by this configure script"
     echo "It seems nobody has ported MPlayer to your OS or CPU type yet."
@@ -1527,13 +1536,19 @@
   fi
   _stripbinaries=no
 elif test -z "$CFLAGS" ; then
+  if test "$cc_vendor" = "intel" ; then
+    CFLAGS="-O2 $_march $_mcpu $_pipe -fomit-frame-pointer"
+  else
     CFLAGS="-O4 $_march $_mcpu $_pipe -ffast-math -fomit-frame-pointer"
+  fi
 else
   _warn_CFLAGS=yes
 fi
 if test -n "$LDFLAGS" ; then
   _ld_extra="$_ld_extra $LDFLAGS"
   _warn_CFLAGS=yes
+elif test "$cc_vendor" = "intel" ; then
+  _ld_extra="$_ld_extra -i-static"
 fi
 if test -n "$CPPFLAGS" ; then
   _inc_extra="$_inc_extra $CPPFLAGS"