From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:40045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1CHH-0005D8-Co for qemu-devel@nongnu.org; Fri, 13 May 2016 08:33:17 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1b1CH8-0006js-RB for qemu-devel@nongnu.org; Fri, 13 May 2016 08:33:10 -0400 Received: from mx1.redhat.com ([209.132.183.28]:36067) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1b1CH8-0006iL-Kb for qemu-devel@nongnu.org; Fri, 13 May 2016 08:33:02 -0400 Received: from int-mx14.intmail.prod.int.phx2.redhat.com (int-mx14.intmail.prod.int.phx2.redhat.com [10.5.11.27]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 014EF3D1F5 for ; Fri, 13 May 2016 12:33:01 +0000 (UTC) From: Gerd Hoffmann Date: Fri, 13 May 2016 14:32:43 +0200 Message-Id: <1463142777-13040-4-git-send-email-kraxel@redhat.com> In-Reply-To: <1463142777-13040-1-git-send-email-kraxel@redhat.com> References: <1463142777-13040-1-git-send-email-kraxel@redhat.com> Subject: [Qemu-devel] [PULL v2 03/17] configure: build SDL if only SDL2 available List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Cole Robinson , Gerd Hoffmann From: Cole Robinson Right now if SDL2 is installed but not SDL1, default configure will entirely disable SDL. Check upfront for SDL2 using pkg-config, but still prefer SDL1 if both versions are installed. Signed-off-by: Cole Robinson Message-id: c9e570b5964d128a3595efe3170129a3da459776.1462557436.git.crobinso@redhat.com Signed-off-by: Gerd Hoffmann --- configure | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/configure b/configure index c37fc5f..0b53fac 100755 --- a/configure +++ b/configure @@ -207,7 +207,7 @@ fdt="" netmap="no" pixman="" sdl="" -sdlabi="1.2" +sdlabi="" virtfs="" vnc="yes" sparse="no" @@ -2420,6 +2420,16 @@ fi # Look for sdl configuration program (pkg-config or sdl-config). Try # 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 + sdlabi=2.0 + else + sdlabi=1.2 + fi +fi + if test $sdlabi = "2.0"; then sdl_config=$sdl2_config sdlname=sdl2 -- 1.8.3.1