mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

sdl: prefer sdl2 over sdl1

Browse Source 
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
This commit is contained in:
Gerd Hoffmann 2017-06-06 12:53:37 +02:00
parent 5fe309ff0d
commit 8f4ea9cd0b
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -2598,12 +2598,12 @@ fi
# sdl-config even without cross prefix, and favour pkg-config over sdl-config. # sdl-config even without cross prefix, and favour pkg-config over sdl-config.
if test "$sdlabi" = ""; then if test "$sdlabi" = ""; then
if $pkg_config --exists "sdl"; then if $pkg_config --exists "sdl2"; then
sdlabi=1.2
elif $pkg_config --exists "sdl2"; then
sdlabi=2.0 sdlabi=2.0
else elif $pkg_config --exists "sdl"; then
sdlabi=1.2 sdlabi=1.2
else
sdlabi=2.0
fi fi
fi fi
@ -2630,7 +2630,7 @@ elif has ${sdl_config}; then
sdlversion=$($sdlconfig --version) sdlversion=$($sdlconfig --version)
else else
if test "$sdl" = "yes" ; then if test "$sdl" = "yes" ; then
feature_not_found "sdl" "Install SDL devel" feature_not_found "sdl" "Install SDL2-devel"
fi fi
sdl=no sdl=no
fi fi