diff options
| author | Gerd Hoffmann | 2017-06-06 12:53:37 +0200 |
|---|---|---|
| committer | Gerd Hoffmann | 2017-06-14 09:51:45 +0200 |
| commit | 8f4ea9cd0b770dbe496d9d24f0ef8813fdbfe0d0 (patch) | |
| tree | 1907da60d1df89407d5270af523d4d4a5cd34761 /configure | |
| parent | gtk: prefer gtk3 over gtk2 (diff) | |
| download | qemu-8f4ea9cd0b770dbe496d9d24f0ef8813fdbfe0d0.tar.gz qemu-8f4ea9cd0b770dbe496d9d24f0ef8813fdbfe0d0.tar.xz qemu-8f4ea9cd0b770dbe496d9d24f0ef8813fdbfe0d0.zip | |
sdl: prefer sdl2 over sdl1
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 <kraxel@redhat.com>
Reviewed-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20170606105339.3613-3-kraxel@redhat.com
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -2598,12 +2598,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 - else + elif $pkg_config --exists "sdl"; then sdlabi=1.2 + else + sdlabi=2.0 fi fi @@ -2630,7 +2630,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 |