Commit 8f4ea9cd authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

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: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 20170606105339.3613-3-kraxel@redhat.com
parent 5fe309ff

configure

+5 −5
Original line number Diff line number Diff line
@@ -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