On 11/09/2011 12:54 PM, Pavel Borzenkov wrote:
When SDL support is disabled, there is no way to build QEMU without
Cocoa support on MacOS X. This patch adds '--disable-cocoa' switch and
allows to build QEMU without both SDL and Cocoa frontends.

Signed-off-by: Pavel Borzenkov<pavel.borzen...@gmail.com>

This breaks SDL probing on Linux.

---
  configure |   11 ++++++-----
  1 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/configure b/configure
index 9e5da44..ba3a830 100755
--- a/configure
+++ b/configure
@@ -669,6 +669,8 @@ for opt do
    ;;
    --enable-profiler) profiler="yes"
    ;;
+  --disable-cocoa) cocoa="no"
+  ;;
    --enable-cocoa)
        cocoa="yes" ;
        sdl="no" ;
@@ -979,7 +981,10 @@ echo "  --disable-sdl            disable SDL"
  echo "  --enable-sdl             enable SDL"
  echo "  --disable-vnc            disable VNC"
  echo "  --enable-vnc             enable VNC"
-echo "  --enable-cocoa           enable COCOA (Mac OS X only)"
+if test "$darwin" = "yes" ; then
+    echo "  --disable-cocoa          disable COCOA"
+    echo "  --enable-cocoa           enable COCOA"
+fi
  echo "  --audio-drv-list=LIST    set audio drivers list:"
  echo "                           Available drivers: $audio_possible_drivers"
  echo "  --audio-card-list=LIST   set list of emulated audio cards 
[$audio_card_list]"
@@ -1424,10 +1429,6 @@ EOF
    if compile_prog "$sdl_cflags" "$sdl_libs" ; then
      if test "$_sdlversion" -lt 121 ; then
        sdl_too_old=yes
-    else
-      if test "$cocoa" = "no" ; then
-        sdl=yes
-      fi

This is what normally enables SDL.

Regards,

Anthony Liguori
      fi

      # static link with sdl ? (note: sdl.pc's --static --libs is broken)


Reply via email to