From 3bc036171f2e14a8e51d7f3498b2af25a0016093 Mon Sep 17 00:00:00 2001 From: Michael Niedermayer Date: Tue, 23 Sep 2014 02:20:25 +0200 Subject: [PATCH] configure: fail if SDL is unavailable and --enable-sdl is specified MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Reimar Döffinger Signed-off-by: Michael Niedermayer --- configure | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/configure b/configure index 0d016c5b9a..64a5bf90a2 100755 --- a/configure +++ b/configure @@ -4912,7 +4912,6 @@ if enabled libdc1394; then die "ERROR: No version of libdc1394 found " fi if ! disabled sdl; then - disable sdl SDL_CONFIG="${cross_prefix}sdl-config" if check_pkg_config sdl SDL_events.h SDL_PollEvent; then check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && @@ -4926,6 +4925,10 @@ if ! disabled sdl; then check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) >= 0x010201" $sdl_cflags && check_cpp_condition SDL.h "(SDL_MAJOR_VERSION<<16 | SDL_MINOR_VERSION<<8 | SDL_PATCHLEVEL) < 0x010300" $sdl_cflags && enable sdl + elif enabled sdl ; then + die "ERROR: SDL not found" + else + disable sdl fi fi fi