OpenE2K
/
qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

configure: fix sdl detection using sdl2-config 

If SDL2 is requested but pkg-config doesn't have a module for it
configure should fallback to use sdl*-config, but wasn't able to
because and old variable (from SDL) was being used by mistake.

Correct the variable name and complete other related changes so
there are no more references to the old SDL.

Fixes: 0015ca5cba ("ui: remove support for SDL1.2 in favour of SDL2")
Signed-off-by: Carlo Marcelo Arenas Belón <carenas@gmail.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Message-Id: <20190710225528.409-1-carenas@gmail.com>
Signed-off-by: Laurent Vivier <laurent@vivier.eu>
This commit is contained in:
Carlo Marcelo Arenas Belón 2019-07-10 15:55:28 -07:00 committed by Laurent Vivier
parent edd318b7a3
commit aee8a61946
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure vendored
View File

@ -3022,15 +3022,15 @@ fi
########################################## ##########################################
# SDL probe # SDL probe
# Look for sdl configuration program (pkg-config or sdl-config). Try # Look for sdl configuration program (pkg-config or sdl2-config). Try
# sdl-config even without cross prefix, and favour pkg-config over sdl-config. # sdl2-config even without cross prefix, and favour pkg-config over sdl2-config.
sdl_probe () sdl_probe ()
{ {
if $pkg_config sdl2 --exists; then if $pkg_config sdl2 --exists; then
sdlconfig="$pkg_config sdl2" sdlconfig="$pkg_config sdl2"
sdlversion=$($sdlconfig --modversion 2>/dev/null) sdlversion=$($sdlconfig --modversion 2>/dev/null)
elif has ${sdl_config}; then elif has "$sdl2_config"; then
sdlconfig="$sdl2_config" sdlconfig="$sdl2_config"
sdlversion=$($sdlconfig --version) sdlversion=$($sdlconfig --version)
else else
@ -3041,7 +3041,7 @@ sdl_probe ()
# no need to do the rest # no need to do the rest
return return
fi fi
if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" = sdl-config; then if test -n "$cross_prefix" && test "$(basename "$sdlconfig")" = sdl2-config; then
echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2 echo warning: using "\"$sdlconfig\"" to detect cross-compiled sdl >&2
fi fi
@ -8023,7 +8023,6 @@ preserve_env PKG_CONFIG
preserve_env PKG_CONFIG_LIBDIR preserve_env PKG_CONFIG_LIBDIR
preserve_env PKG_CONFIG_PATH preserve_env PKG_CONFIG_PATH
preserve_env PYTHON preserve_env PYTHON
preserve_env SDL_CONFIG
preserve_env SDL2_CONFIG preserve_env SDL2_CONFIG
preserve_env SMBD preserve_env SMBD
preserve_env STRIP preserve_env STRIP