[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 04/14] configure: fix sdl detection using sdl2-config
From: |
Laurent Vivier |
Subject: |
[Qemu-devel] [PULL 04/14] configure: fix sdl detection using sdl2-config |
Date: |
Wed, 21 Aug 2019 13:19:37 +0200 |
From: Carlo Marcelo Arenas Belón <address@hidden>
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 <address@hidden>
Reviewed-by: Thomas Huth <address@hidden>
Message-Id: <address@hidden>
Signed-off-by: Laurent Vivier <address@hidden>
---
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
--
2.21.0
- [Qemu-devel] [PULL 14/14] hw/display: Compile various display devices as common object, (continued)
- [Qemu-devel] [PULL 14/14] hw/display: Compile various display devices as common object, Laurent Vivier, 2019/08/21
- [Qemu-devel] [PULL 08/14] hw/dma/omap_dma: Move switch 'fall through' comment to correct place, Laurent Vivier, 2019/08/21
- [Qemu-devel] [PULL 02/14] misc: fix naming scheme of compatiblity arrays, Laurent Vivier, 2019/08/21
- [Qemu-devel] [PULL 11/14] vl: Rewrite a fall through comment, Laurent Vivier, 2019/08/21
- [Qemu-devel] [PULL 03/14] configure: remove obsoleted $sparc_cpu variable, Laurent Vivier, 2019/08/21
- [Qemu-devel] [PULL 06/14] hw/net/e1000: Fix erroneous comment, Laurent Vivier, 2019/08/21
- [Qemu-devel] [PULL 12/14] spapr_events: Rewrite a fall through comment, Laurent Vivier, 2019/08/21
- [Qemu-devel] [PULL 10/14] target/ppc: Rewrite a fall through comment, Laurent Vivier, 2019/08/21
- [Qemu-devel] [PULL 09/14] hw/ipmi: Rewrite a fall through comment, Laurent Vivier, 2019/08/21
- [Qemu-devel] [PULL 04/14] configure: fix sdl detection using sdl2-config,
Laurent Vivier <=
- Re: [Qemu-devel] [PULL 00/14] Trivial branch patches, Peter Maydell, 2019/08/22