[MPlayer-dev-eng] [PATCH]Disable liba52 and libmp3 for icc

[Carl Eugen Hoyos]

Hi!

Currently, icc can't compile the internal libraries liba52 and libmp3 
(with optimizations). Attached patch changes the default 
for both libraries from "enabled" to "autodetect" and disables the 
comilation for intel compilers.

Ok to apply?

Carl Eugen
-------------- next part --------------
Index: configure
===================================================================
--- configure	(Revision 26271)
+++ configure	(Arbeitskopie)
@@ -315,8 +315,8 @@
   --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-liba52          disable builtin liba52 [enabled]
+  --disable-mp3lib          disable builtin mp3lib [autodetect]
+  --disable-liba52          disable builtin liba52 [autodetect]
   --disable-libmpeg2        disable builtin libmpeg2 [autodetect]
   --disable-musepack        disable musepack support [autodetect]
   --disable-libamr_nb       disable libamr narrowband [autodetect]
@@ -565,8 +565,8 @@
 _libvorbis=auto
 _speex=auto
 _theora=auto
-_mp3lib=yes
-_liba52=yes
+_mp3lib=auto
+_liba52=auto
 _libdca=auto
 _libmpeg2=auto
 _faad_internal=auto
@@ -6002,6 +6002,9 @@
 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 USE_MP3LIB 1'
   _codecmodules="mp3lib $_codecmodules"
@@ -6012,6 +6015,9 @@
 echores "$_mp3lib"
 
 echocheck "internal liba52 support"
+if test "$_liba52" = auto ; then
+  test "$cc_vendor" = intel && _liba52=no || _liba52=yes
+fi
 if test "$_liba52" = yes ; then
   _def_liba52='#define USE_LIBA52 1'
   _codecmodules="liba52 $_codecmodules"