[FFmpeg-cvslog] configure: support --disable-sdl
Michael Niedermayer
git at videolan.org
Wed Sep 24 02:43:18 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Sep 22 22:13:22 2014 +0200| [a7ed01082f25aefdb9996716737b9892dafdf9de] | committer: Michael Niedermayer
configure: support --disable-sdl
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7ed01082f25aefdb9996716737b9892dafdf9de
---
configure | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/configure b/configure
index 12b2da5..03ed27c 100755
--- a/configure
+++ b/configure
@@ -261,6 +261,7 @@ External library support:
--enable-opencl enable OpenCL code
--enable-opengl enable OpenGL rendering [no]
--enable-openssl enable openssl [no]
+ --disable-sdl disable sdl [autodetect]
--enable-x11grab enable X11 grabbing [no]
--disable-xlib disable xlib [autodetect]
--disable-zlib disable zlib [autodetect]
@@ -1388,6 +1389,7 @@ EXTERNAL_LIBRARY_LIST="
opencl
opengl
openssl
+ sdl
x11grab
xlib
zlib
@@ -4909,7 +4911,8 @@ if enabled libdc1394; then
enable libdc1394_1; } ||
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 +4928,7 @@ else
enable sdl
fi
fi
+fi
enabled sdl && add_cflags $sdl_cflags && add_extralibs $sdl_libs
makeinfo --version > /dev/null 2>&1 && enable makeinfo || disable makeinfo
More information about the ffmpeg-cvslog
mailing list