[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/7] sdl: prefer sdl2 over sdl1
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/7] sdl: prefer sdl2 over sdl1 |
Date: |
Thu, 8 Jun 2017 09:07:13 +0200 |
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 <address@hidden>
Reviewed-by: Marc-André Lureau <address@hidden>
Message-id: address@hidden
---
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
- [Qemu-devel] [PULL 0/7] ui patch queue, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 6/7] sdl: add deprecation warning for sdl1, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 3/7] gtk: prefer gtk3 over gtk2, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 5/7] gtk: add deprecation warning for gtk2, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 2/7] spice: Use proper enum type for kbd led state, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 1/7] Improve Cocoa modifier key handling, Gerd Hoffmann, 2017/06/08
- [Qemu-devel] [PULL 4/7] sdl: prefer sdl2 over sdl1,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 7/7] spice: don't enter opengl mode in case another UI provides opengl support, Gerd Hoffmann, 2017/06/08
- Re: [Qemu-devel] [PULL 0/7] ui patch queue, Peter Maydell, 2017/06/12
- Re: [Qemu-devel] [PULL 0/7] ui patch queue, Gerd Hoffmann, 2017/06/13