[FFmpeg-devel] [PATCH] configure: fail if SDL is unavailable and --enable-sdl is specified

Michael Niedermayer michaelni at gmx.at
Tue Sep 23 02:26:34 CEST 2014


Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
---
 configure |    5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/configure b/configure
index f674a06..e3c238b 100755
--- a/configure
+++ b/configure
@@ -4911,7 +4911,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 &&
@@ -4925,6 +4924,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
-- 
1.7.9.5



More information about the ffmpeg-devel mailing list