Mercurial > mplayer.hg
changeset 29683:3ed1dc05c83b
Intel compiler icc 11.1 supports compilation of internal mp3lib and internal liba52.
| author | cehoyos |
|---|---|
| date | Sun, 27 Sep 2009 21:25:56 +0000 |
| parents | 8ba2026a165e |
| children | 23c0da51c660 |
| files | configure |
| diffstat | 1 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun Sep 27 19:22:48 2009 +0000 +++ b/configure Sun Sep 27 21:25:56 2009 +0000 @@ -6503,7 +6503,7 @@ echocheck "internal mp3lib support" if test "$_mp3lib" = auto ; then - test "$cc_vendor" = intel && _mp3lib=no || _mp3lib=yes + test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _mp3lib=no || _mp3lib=yes fi if test "$_mp3lib" = yes ; then def_mp3lib='#define CONFIG_MP3LIB 1' @@ -6516,7 +6516,7 @@ echocheck "liba52 support" if test "$_liba52_internal" = auto ; then - test "$cc_vendor" = intel && _liba52_internal=no || _liba52_internal=yes + test "$cc_vendor" = intel && test "$_cc_major" -le 10 -o "$_cc_major" -eq 11 -a "$_cc_minor" -eq 0 && _liba52_internal=no || _liba52_internal=yes fi def_liba52='#undef CONFIG_LIBA52' def_liba52_internal="#undef CONFIG_LIBA52_INTERNAL"