Disable mp3lib and liba52-internal for icc.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27721 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 9 insertions, 3 deletions

diff --git a/configure b/configure
index fccf0840d6..89dafdf10b 100755
--- a/configure
+++ b/configure
@@ -320,7 +320,7 @@ Codecs:
   --disable-twolame         disable Twolame (MPEG layer 2) encoding [autodetect]
   --enable-xmms             enable XMMS input plugin support [disabled]
   --enable-libdca           enable libdca support [autodetect]
-  --disable-mp3lib          disable builtin mp3lib [enabled]
+  --disable-mp3lib          disable builtin mp3lib [autodetect]
   --disable-liba52          disable liba52 [autodetect] 
   --disable-liba52-internal disable builtin liba52 [autodetect] 
   --disable-libmpeg2        disable builtin libmpeg2 [autodetect]
@@ -577,9 +577,9 @@ _tremor_low=no
 _libvorbis=auto
 _speex=auto
 _theora=auto
-_mp3lib=yes
+_mp3lib=auto
 _liba52=auto
-_liba52_internal=yes
+_liba52_internal=auto
 _libdca=auto
 _libmpeg2=auto
 _faad=auto
@@ -6006,6 +6006,9 @@ fi
 echores "$_theora"
 
 echocheck "internal mp3lib support"
+if test "$_mp3lib" = auto ; then
+  test "$cc_vendor" = intel && _mp3lib=no || _mp3lib=yes
+fi
 if test "$_mp3lib" = yes ; then
   _def_mp3lib='#define CONFIG_MP3LIB 1'
   _codecmodules="mp3lib $_codecmodules"
@@ -6016,6 +6019,9 @@ fi
 echores "$_mp3lib"
 
 echocheck "liba52 support"
+if test "$_liba52_internal" = auto ; then
+  test "$cc_vendor" = intel && _liba52_internal=no || _liba52_internal=yes
+fi
 _def_liba52='#undef CONFIG_LIBA52'
 _def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"
 if test "$_liba52_internal" = yes ; then