OSDN Git Service

configure: fail if SDL is unavailable and --enable-sdl is specified
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 23 Sep 2014 00:20:25 +0000 (02:20 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 24 Sep 2014 00:32:56 +0000 (02:32 +0200)
Reviewed-by: Reimar Döffinger <Reimar.Doeffinger@gmx.de>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
configure

index 0d016c5..64a5bf9 100755 (executable)
--- 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