diff options
| author | Cole Robinson <crobinso@redhat.com> | 2016-05-06 14:03:07 -0400 |
|---|---|---|
| committer | Gerd Hoffmann <kraxel@redhat.com> | 2016-05-11 08:02:40 +0200 |
| commit | ee8466d0ea1db1d19e1d56817df0668eeb6924eb (patch) | |
| tree | 6924d89583479070a765952794362e15b80dab51 /configure | |
| parent | 56f289f383a871e871f944c7226920b35794efe6 (diff) | |
| download | qemu-ee8466d0ea1db1d19e1d56817df0668eeb6924eb.zip qemu-ee8466d0ea1db1d19e1d56817df0668eeb6924eb.tar.gz qemu-ee8466d0ea1db1d19e1d56817df0668eeb6924eb.tar.bz2 | |
configure: build SDL if only SDL2 available
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 <crobinso@redhat.com>
Message-id: c9e570b5964d128a3595efe3170129a3da459776.1462557436.git.crobinso@redhat.com
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 12 |
1 files changed, 11 insertions, 1 deletions
@@ -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 |