Index: configure
===================================================================
RCS file: /sources/qemu/qemu/configure,v
retrieving revision 1.119
diff -u -r1.119 configure
--- configure	18 Jan 2007 20:06:33 -0000	1.119
+++ configure	24 Jan 2007 20:15:37 -0000
@@ -128,6 +128,8 @@
 bsd="yes"
 darwin="yes"
 darwin_user="yes"
+cocoa="yes"
+coreaudio="yes"
 OS_CFLAGS="-mdynamic-no-pic"
 ;;
 SunOS)
@@ -503,7 +505,9 @@
 if test "$_sdlversion" -lt 121 ; then
 sdl_too_old=yes
 else
-sdl=yes
+ if test "$cocoa" = "no" ; then
+   sdl=yes
+ fi
 fi
 
 # static link with sdl ?
@@ -524,6 +528,13 @@
 fi # sdl compile test
 
 fi # cross compilation
+
+else
+ # Make sure to disable cocoa if sdl was set
+ if test "$sdl" = "yes" ; then
+   cocoa="no"
+   coreaudio="no"
+ fi
 fi # -z $sdl
 
 ##########################################