aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-09-23 02:20:25 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-24 02:32:56 +0200
commit3bc036171f2e14a8e51d7f3498b2af25a0016093 (patch)
tree9f62969e0ad4d93eff49b866f75a7f508275b414
parentfb01a1846244a9e8ad4a65d9ab5e3343d5b57dd8 (diff)
downloadffmpeg-3bc036171f2e14a8e51d7f3498b2af25a0016093.tar.gz
configure: fail if SDL is unavailable and --enable-sdl is specified
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de> Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rwxr-xr-xconfigure5
1 files changed, 4 insertions, 1 deletions
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