[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL v2 03/17] configure: build SDL if only SDL2 available
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL v2 03/17] configure: build SDL if only SDL2 available |
Date: |
Fri, 13 May 2016 14:32:43 +0200 |
From: Cole Robinson <address@hidden>
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 <address@hidden>
Message-id: address@hidden
Signed-off-by: Gerd Hoffmann <address@hidden>
---
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
- [Qemu-devel] [PULL v2 06/17] configure: report GTK version, (continued)
- [Qemu-devel] [PULL v2 06/17] configure: report GTK version, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 04/17] configure: error on unknown --with-sdlabi value, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 12/17] spice/gl: add & use qemu_spice_gl_monitor_config, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 13/17] Changed malloc to g_malloc, free to g_free in ui/shader.c, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 10/17] ui: gtk: Fix some deprecation warnings, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 07/17] configure: report SDL version, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 05/17] configure: add echo_version helper, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 01/17] ui: gtk: fix crash when terminal inner-border is NULL, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 15/17] spice: fix coverity complains, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 09/17] ui: gtk: Fix a runtime warning on vte >= 0.37, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 03/17] configure: build SDL if only SDL2 available,
Gerd Hoffmann <=
- [Qemu-devel] [PULL v2 14/17] egl-helpers: fix possible resource leak, Gerd Hoffmann, 2016/05/13
- [Qemu-devel] [PULL v2 08/17] configure: support vte-2.91, Gerd Hoffmann, 2016/05/13
- Re: [Qemu-devel] [PULL v2 00/17] ui patch queue, Peter Maydell, 2016/05/13