From nobody Sat Feb 7 04:47:03 2026 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zoho.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org; Return-Path: Received: from lists.gnu.org (lists.gnu.org [208.118.235.17]) by mx.zohomail.com with SMTPS id 1497427343961608.8774593187006; Wed, 14 Jun 2017 01:02:23 -0700 (PDT) Received: from localhost ([::1]:47043 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL3Fu-00019k-Ph for importer@patchew.org; Wed, 14 Jun 2017 04:02:22 -0400 Received: from eggs.gnu.org ([2001:4830:134:3::10]:46581) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dL3Am-0005Sa-7u for qemu-devel@nongnu.org; Wed, 14 Jun 2017 03:57:05 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dL3Aj-0002Iz-AC for qemu-devel@nongnu.org; Wed, 14 Jun 2017 03:57:04 -0400 Received: from mx1.redhat.com ([209.132.183.28]:49338) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dL3Aj-0002IL-4W for qemu-devel@nongnu.org; Wed, 14 Jun 2017 03:57:01 -0400 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.phx2.redhat.com [10.5.11.16]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 18DF2C04B310 for ; Wed, 14 Jun 2017 07:57:00 +0000 (UTC) Received: from sirius.home.kraxel.org (ovpn-116-125.ams2.redhat.com [10.36.116.125]) by smtp.corp.redhat.com (Postfix) with ESMTP id 158D9777C8; Wed, 14 Jun 2017 07:56:58 +0000 (UTC) Received: by sirius.home.kraxel.org (Postfix, from userid 1000) id C1A6E16E35; Wed, 14 Jun 2017 09:56:59 +0200 (CEST) DMARC-Filter: OpenDMARC Filter v1.3.2 mx1.redhat.com 18DF2C04B310 Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; dmarc=none (p=none dis=none) header.from=redhat.com Authentication-Results: ext-mx07.extmail.prod.ext.phx2.redhat.com; spf=pass smtp.mailfrom=kraxel@redhat.com DKIM-Filter: OpenDKIM Filter v2.11.0 mx1.redhat.com 18DF2C04B310 From: Gerd Hoffmann To: qemu-devel@nongnu.org Date: Wed, 14 Jun 2017 09:56:52 +0200 Message-Id: <20170614075653.26420-5-kraxel@redhat.com> In-Reply-To: <20170614075653.26420-1-kraxel@redhat.com> References: <20170614075653.26420-1-kraxel@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.79 on 10.5.11.16 X-Greylist: Sender IP whitelisted, not delayed by milter-greylist-4.5.16 (mx1.redhat.com [10.5.110.31]); Wed, 14 Jun 2017 07:57:00 +0000 (UTC) Content-Transfer-Encoding: quoted-printable X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 209.132.183.28 Subject: [Qemu-devel] [PULL 4/5] sdl: prefer sdl2 over sdl1 X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Gerd Hoffmann Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Type: text/plain; charset="utf-8" In case the configure script finds both SDL 1.2 and SDL 2.x installed it still prefers SDL 1.2. Prefer SDL 2.x instead. Signed-off-by: Gerd Hoffmann Reviewed-by: Marc-Andr=C3=A9 Lureau Message-id: 20170606105339.3613-3-kraxel@redhat.com --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index bfba156a41..db0798d51d 100755 --- a/configure +++ b/configure @@ -2598,12 +2598,12 @@ fi # sdl-config even without cross prefix, and favour pkg-config over sdl-con= fig. =20 if test "$sdlabi" =3D ""; then - if $pkg_config --exists "sdl"; then - sdlabi=3D1.2 - elif $pkg_config --exists "sdl2"; then + if $pkg_config --exists "sdl2"; then sdlabi=3D2.0 + elif $pkg_config --exists "sdl"; then + sdlabi=3D1.2 else - sdlabi=3D1.2 + sdlabi=3D2.0 fi fi =20 @@ -2630,7 +2630,7 @@ elif has ${sdl_config}; then sdlversion=3D$($sdlconfig --version) else if test "$sdl" =3D "yes" ; then - feature_not_found "sdl" "Install SDL devel" + feature_not_found "sdl" "Install SDL2-devel" fi sdl=3Dno fi --=20 2.9.3