From patchwork Fri Aug 14 15:10:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 52446 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-la0-f69.google.com (mail-la0-f69.google.com [209.85.215.69]) by patches.linaro.org (Postfix) with ESMTPS id DCB0F2031F for ; Fri, 14 Aug 2015 15:10:56 +0000 (UTC) Received: by labd1 with SMTP id d1sf28798803lab.0 for ; Fri, 14 Aug 2015 08:10:55 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:x-original-sender:x-original-authentication-results :precedence:mailing-list:list-id:list-post:list-help:list-archive :list-unsubscribe; bh=C+o5MMKfhX+1sVV0KeOCMEUNuaxiclebMBu/eGWyQbA=; b=Vt0J5bwi9hFpYxLQ/x2U8Y6dxogRIZCvgj0tdSWkl8f1vpuNYyRhvIbdTZgbjfBemg KDGtHhkiUm9G7sQBQX4N5Q06cEsP8+oCu2yUEyBwrJUBbvPr3T9dUhv4DVnLW8HoudKW LeAdI2o5tsORefMIl47MUPqF3UEoYo9tDiaAanDCmbl4zFNOJjcnsR+6t2BVsufKN+l6 Z07xs9zdLljT5MZMfQ1Zo3BJD7QehPaZ+/rIhADXmQhxJ59JNoff+ISkTGkqzbGRvMJZ 08mzXA9s9g6XLtmk1G7DJh+a/+3KjgAqBAMg80+w6m0L9CxuQI9pNg/EkkLKDOSfKaU6 ZXKQ== X-Gm-Message-State: ALoCoQnkiBtAaCwNi+lxD+2mE/ba8lsNej9yvt+o9QZqhuS8/GbJlOPyby5tnf20MeYPFnmxdYbZ X-Received: by 10.112.78.101 with SMTP id a5mr10101453lbx.9.1439565055830; Fri, 14 Aug 2015 08:10:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.28.226 with SMTP id e2ls373828lah.14.gmail; Fri, 14 Aug 2015 08:10:55 -0700 (PDT) X-Received: by 10.112.138.170 with SMTP id qr10mr44688723lbb.14.1439565055688; Fri, 14 Aug 2015 08:10:55 -0700 (PDT) Received: from mail-la0-f52.google.com (mail-la0-f52.google.com. [209.85.215.52]) by mx.google.com with ESMTPS id j5si6123959laf.127.2015.08.14.08.10.55 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Aug 2015 08:10:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) client-ip=209.85.215.52; Received: by lahi9 with SMTP id i9so45449224lah.2 for ; Fri, 14 Aug 2015 08:10:55 -0700 (PDT) X-Received: by 10.152.4.163 with SMTP id l3mr45147121lal.35.1439565055236; Fri, 14 Aug 2015 08:10:55 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.7.198 with SMTP id l6csp1689120lba; Fri, 14 Aug 2015 08:10:54 -0700 (PDT) X-Received: by 10.180.84.230 with SMTP id c6mr7976785wiz.32.1439565054398; Fri, 14 Aug 2015 08:10:54 -0700 (PDT) Received: from mnementh.archaic.org.uk (mnementh.archaic.org.uk. [2001:8b0:1d0::1]) by mx.google.com with ESMTPS id fq10si4307637wib.21.2015.08.14.08.10.54 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 14 Aug 2015 08:10:54 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of pm215@archaic.org.uk designates 2001:8b0:1d0::1 as permitted sender) client-ip=2001:8b0:1d0::1; Received: from pm215 by mnementh.archaic.org.uk with local (Exim 4.80) (envelope-from ) id 1ZQGdA-0000uE-NA; Fri, 14 Aug 2015 16:10:52 +0100 From: Peter Maydell To: qemu-devel@nongnu.org Cc: patches@linaro.org, Programmingkid , =?UTF-8?q?Andreas=20F=C3=A4rber?= Subject: [PATCH] configure: Don't permit SDL or GTK on OSX Date: Fri, 14 Aug 2015 16:10:52 +0100 Message-Id: <1439565052-3457-1-git-send-email-peter.maydell@linaro.org> X-Mailer: git-send-email 1.7.10.4 X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: peter.maydell@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.52 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , The cocoa GUI frontend assumes it is the only GUI (it redefines main() so it always gets control before the rest of QEMU), so it does not play well with other UIs like SDL or GTK. (Mostly people building QEMU on OSX don't have the necessary dependencies available for configure to build those other front ends, so mostly this problem goes unnoticed.) Make configure automatically disable the SDL and GTK front ends if the cocoa front end is enabled. (We were sort of attempting to do this for SDL before, but not in a way that worked very well.) Signed-off-by: Peter Maydell --- In an ideal world, we'd fix the Cocoa UI front end to play nicely with others, but in the meantime, let's at least give a helpful message to users if they try to select combinations of configure options that won't work. configure | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/configure b/configure index cd219d8..826858e 100755 --- a/configure +++ b/configure @@ -956,7 +956,6 @@ for opt do ;; --enable-cocoa) cocoa="yes" ; - sdl="no" ; audio_drv_list="coreaudio `echo $audio_drv_list | sed s,coreaudio,,g`" ;; --disable-system) softmmu="no" @@ -1711,6 +1710,21 @@ else fi ########################################## +# cocoa implies not SDL or GTK +# (the cocoa UI code currently assumes it is always the active UI +# and doesn't interact well with other UI frontend code) +if test "$cocoa" = "yes"; then + if test "$sdl" = "yes"; then + error_exit "Cocoa and SDL UIs cannot both be enabled at once" + fi + if test "$gtk" = "yes"; then + error_exit "Cocoa and GTK UIs cannot both be enabled at once" + fi + gtk=no + sdl=no +fi + +########################################## # L2TPV3 probe cat > $TMPC <