From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:35151) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1dIC7S-000864-Bc for qemu-devel@nongnu.org; Tue, 06 Jun 2017 06:53:51 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1dIC7P-0006Ks-Bm for qemu-devel@nongnu.org; Tue, 06 Jun 2017 06:53:50 -0400 Received: from mx1.redhat.com ([209.132.183.28]:51980) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1dIC7P-0006JI-61 for qemu-devel@nongnu.org; Tue, 06 Jun 2017 06:53:47 -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 DD09361D0F for ; Tue, 6 Jun 2017 10:53:45 +0000 (UTC) From: Gerd Hoffmann Date: Tue, 6 Jun 2017 12:53:37 +0200 Message-Id: <20170606105339.3613-3-kraxel@redhat.com> In-Reply-To: <20170606105339.3613-1-kraxel@redhat.com> References: <20170606105339.3613-1-kraxel@redhat.com> Subject: [Qemu-devel] [PATCH 2/4] sdl: prefer sdl2 over sdl1 List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Gerd Hoffmann 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 --- configure | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/configure b/configure index b75b9c57c0..44c773a5cd 100755 --- a/configure +++ b/configure @@ -2622,12 +2622,12 @@ fi # sdl-config even without cross prefix, and favour pkg-config over sdl-config. if test "$sdlabi" = ""; then - if $pkg_config --exists "sdl"; then - sdlabi=1.2 - elif $pkg_config --exists "sdl2"; then + if $pkg_config --exists "sdl2"; then sdlabi=2.0 + elif $pkg_config --exists "sdl"; then + sdlabi=1.2 else - sdlabi=1.2 + sdlabi=2.0 fi fi @@ -2654,7 +2654,7 @@ elif has ${sdl_config}; then sdlversion=$($sdlconfig --version) else if test "$sdl" = "yes" ; then - feature_not_found "sdl" "Install SDL devel" + feature_not_found "sdl" "Install SDL2-devel" fi sdl=no fi -- 2.9.3