From 3fa1eb2a60cdb8822753d1314f31a0676161e74d Mon Sep 17 00:00:00 2001
From: gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 24 Nov 2008 17:27:05 +0000
Subject: add specific test to check if we can enable ao_macosx not matter how
 vo_quartz test may turn out

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28029 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index 547369c485..cf90bc85b7 100755
--- a/configure
+++ b/configure
@@ -3582,9 +3582,23 @@ if test "$_macosx" = auto ; then
 fi
 if test "$_macosx" = yes ; then
   cat > $TMPC <<EOF
+#include <CoreAudio/CoreAudio.h>
+int main(void) { return 0; }
+EOF
+  if cc_check -framework CoreAudio; then
+    _ld_extra="$_ld_extra -framework CoreAudio -framework AudioUnit -framework AudioToolbox"
+    _coreaudio=yes
+    _def_coreaudio='#define CONFIG_COREAUDIO 1'
+    _aosrc="$_aosrc ao_macosx.c"
+    _aomodules="macosx $_aomodules"
+  else
+    _coreaudio=no
+    _def_coreaudio='#undef CONFIG_COREAUDIO'
+    _noaomodules="macosx $_noaomodules"
+  fi
+  cat > $TMPC <<EOF
 #include <Carbon/Carbon.h>
 #include <QuickTime/QuickTime.h>
-#include <CoreAudio/CoreAudio.h>
 int main(void) {
     EnterMovies();
     ExitMovies();
-- 
cgit v1.2.3


From 0cee72fb5b0e13c6f5c9b6c6a3f597e926a3c795 Mon Sep 17 00:00:00 2001
From: gpoirier <gpoirier@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Mon, 24 Nov 2008 17:29:37 +0000
Subject: now that we have a specific check to enable ao_macosx or not, don't
 let test for vo_quartz set if ao_macosx should be enabled or not: it's
 redundant.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28030 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

(limited to 'configure')

diff --git a/configure b/configure
index cf90bc85b7..b34ed5439f 100755
--- a/configure
+++ b/configure
@@ -3606,21 +3606,15 @@ int main(void) {
     return 0;
 }
 EOF
-  if cc_check -framework Carbon -framework QuickTime -framework CoreAudio; then
-    _ld_extra="$_ld_extra -framework Carbon -framework QuickTime -framework CoreAudio -framework AudioUnit -framework AudioToolbox"
-    _coreaudio=yes
-    _def_coreaudio='#define CONFIG_COREAUDIO 1'
-    _aosrc="$_aosrc ao_macosx.c"
-    _aomodules="macosx $_aomodules"
+  if cc_check -framework Carbon -framework QuickTime; then
+    _ld_extra="$_ld_extra -framework Carbon -framework QuickTime"
+    _quartz=yes
     _def_quartz='#define CONFIG_QUARTZ 1'
     _vosrc="$_vosrc vo_quartz.c"
     _vomodules="quartz $_vomodules"
     _def_quicktime='#define CONFIG_QUICKTIME 1'
   else
-    _macosx=no
-    _coreaudio=no
-    _def_coreaudio='#undef CONFIG_COREAUDIO'
-    _noaomodules="macosx $_noaomodules"
+    _quartz=yes
     _def_quartz='#undef CONFIG_QUARTZ'
     _novomodules="quartz $_novomodules"
     _def_quicktime='#undef CONFIG_QUICKTIME'
-- 
cgit v1.2.3


From cc5e0406412a5f8b4e6e7094f6ffa18a65decd74 Mon Sep 17 00:00:00 2001
From: cehoyos <cehoyos@b3059339-0415-0410-9bf9-f77b7e298cf2>
Date: Tue, 25 Nov 2008 18:37:13 +0000
Subject: Enable compilation with icc 11.0.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28038 b3059339-0415-0410-9bf9-f77b7e298cf2
---
 configure | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'configure')

diff --git a/configure b/configure
index b34ed5439f..ae6f4ceea9 100755
--- a/configure
+++ b/configure
@@ -1488,7 +1488,7 @@ if test "`basename $_cc`" = "icc" || test "`basename $_cc`" = "ecc"; then
       cc_version="v. ?.??, bad"
       cc_fail=yes
       ;;
-    10.1)
+    10.1|11.0)
       cc_version="$cc_version, ok"
       ;;
     *)
-- 
cgit v1.2.3