From patchwork Wed Aug 21 11:19:37 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 1150791 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=vivier.eu Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 46D5F73XqPz9sBp for ; Wed, 21 Aug 2019 21:35:23 +1000 (AEST) Received: from localhost ([::1]:47208 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0Otc-0004XP-N8 for incoming@patchwork.ozlabs.org; Wed, 21 Aug 2019 07:35:20 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54846) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1i0OkD-0003jx-R9 for qemu-devel@nongnu.org; Wed, 21 Aug 2019 07:25:38 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1i0OkB-0001Dy-Q6 for qemu-devel@nongnu.org; Wed, 21 Aug 2019 07:25:37 -0400 Received: from mout.kundenserver.de ([212.227.17.24]:52765) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1i0Of0-0006Ld-RK; Wed, 21 Aug 2019 07:20:15 -0400 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue107 [212.227.15.183]) with ESMTPSA (Nemesis) id 1MQMdz-1heD4r3imP-00MIAd; Wed, 21 Aug 2019 13:20:01 +0200 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Wed, 21 Aug 2019 13:19:37 +0200 Message-Id: <20190821111947.26580-5-laurent@vivier.eu> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190821111947.26580-1-laurent@vivier.eu> References: <20190821111947.26580-1-laurent@vivier.eu> MIME-Version: 1.0 X-Provags-ID: V03:K1:q2/G2f7YdljUDamyf4Gd15QAsQ47cXygEbzKIgGClihqqKBJGCY LC56J8jB+qoFP7l4rSOU509MdrudAHJ5NngpLanR3BoClWWcYs3SogqO/5MVOzxg3eixITL yD1CNJgFtAqy8KpK1iip23a5c0XF8RMIsEWd0OtTKVy7sTDpw/wwb8C5HpHvEB0piT58/Zq +0UBfuNiARhEMA8UxmyYg== X-UI-Out-Filterresults: notjunk:1; V03:K0:ik8JSttQOEQ=:R8r/WfpGeJ0Db81at3tMx+ cpu6X4XRc0CDrDpzGEl9ywVQB5RFPKQp8N9WRE6bytthL9+WRqrFiuy9Y0VVhacCjduLrmeoK aYAViYSj1APviaDV76L9eJDlWLe0yBJsEFO8wFdF1szUnw+HNH1wnuHfB5Ak1zVlEy/H9iodP 4Lh0Vb0DqMFdPXNtYsJYep86uYIaxnBJPHA7kFp1+Cgp959fJlMN71L/lp1xCSKDC3M1HxicR CGcepaUIHs/rFq+Qc8pmOIjTwniV4xwTAjO7H84SKCux6mFRIeSZPvAdEa1fA/D+8iZHo/K/g WOqcLdPeda+mLeRrw280M6VgxE0DysQ15k6G2sIP1DIrMVZjPatxCRTexr7auWXnGSAIf2Zq9 aqu9M8Q63DrIyPET6D/H69cPs0bps4iuhECkRke2EnBBjjxYY8HWTABvDI/rdq7Uk47ZN+Fc4 N/TlbTDTx89bRem8FdAdS/xUe+6BaXhn2WDBRkp9QgOF4uMYOk6v7RmCsl/d/PQYkKQ483epX K6LM2CmCOab/wiSn1sIgkVRACcbvqlYqgDDzbkzL0svCfxjhSgfZkoTVJluejoUj1NDjCCu4N t3C/HyRMQqnv1cH6RG1MCHxLv7q0Q1Oh7rIx1SMpnpuKuH5ja+ZiqmaR7zW8nluMtL8ZGEBgo b0UYijrk6fIR8t5cd9ZV5eHgD6bx0S5vvdu4zf4RwAGnv1MYvYjZ39cOQIuo86E59xBKiHkcy P365qKF2+fpLbIfsutnHkSkVQVMuuucPwbbzF+Aa4XqO3cELfD45UMJt5RSVkr2sOURTln5Ln e3rMOdzkBr/veSoAFYVsTjcLyKr+A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PULL 04/14] configure: fix sdl detection using sdl2-config X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Peter Maydell , Thomas Huth , Eduardo Habkost , Corey Minyard , Juan Quintela , qemu-trivial@nongnu.org, Jason Wang , "Michael S. Tsirkin" , Michael Tokarev , Markus Armbruster , Laurent Vivier , qemu-ppc@nongnu.org, Paolo Bonzini , David Gibson , =?utf-8?q?Carlo_Marcelo_A?= =?utf-8?q?renas_Bel=C3=B3n?= , "Dr. David Alan Gilbert" , Richard Henderson Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" From: Carlo Marcelo Arenas Belón If SDL2 is requested but pkg-config doesn't have a module for it configure should fallback to use sdl*-config, but wasn't able to because and old variable (from SDL) was being used by mistake. Correct the variable name and complete other related changes so there are no more references to the old SDL. Fixes: 0015ca5cbabe ("ui: remove support for SDL1.2 in favour of SDL2") Signed-off-by: Carlo Marcelo Arenas Belón Reviewed-by: Thomas Huth Message-Id: <20190710225528.409-1-carenas@gmail.com> Signed-off-by: Laurent Vivier --- configure | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/configure b/configure index 4e7b79c826a2..cc5ce7940582 100755 --- a/configure +++ b/configure @@ -3022,15 +3022,15 @@ fi ########################################## # SDL probe -# Look for sdl configuration program (pkg-config or sdl-config). Try -# sdl-config even without cross prefix, and favour pkg-config over sdl-config. +# Look for sdl configuration program (pkg-config or sdl2-config). Try +# sdl2-config even without cross prefix, and favour pkg-config over sdl2-config. sdl_probe () { if $pkg_config sdl2 --exists; then sdlconfig="$pkg_config sdl2" sdlversion=$($sdlconfig --modversion 2>/dev/null) - elif has ${sdl_config}; then + elif has "$sdl2_config"; then sdlconfig="$sdl2_config" sdlversion=$($sdlconfig --version) else @@ -3041,7 +3041,7 @@ sdl_probe () # no need to do the rest return fi - if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" = sdl-config; then + if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" = sdl2-config; then echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2 fi @@ -8023,7 +8023,6 @@ preserve_env PKG_CONFIG preserve_env PKG_CONFIG_LIBDIR preserve_env PKG_CONFIG_PATH preserve_env PYTHON -preserve_env SDL_CONFIG preserve_env SDL2_CONFIG preserve_env SMBD preserve_env STRIP