diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-19 03:59:32 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-11 03:12:34 +0100 |
| commit | e893440a285fbc174b5c91059ce786f498e745a6 (patch) | |
| tree | 752001b8c0d3bfbe5759ddeb34fe74e6acb460f2 /configure | |
| parent | 9a05e8a3850277a05bfe00f17477ee2146e0c208 (diff) | |
| download | ffmpeg-e893440a285fbc174b5c91059ce786f498e745a6.tar.gz | |
configure: make it possible to disable xlib dependancy
The unconditional dependancy was added in 7671dd7cd7d51bbd637cc46d8f104a141bc355ea
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 7 insertions, 2 deletions
@@ -256,6 +256,7 @@ External library support: --enable-opengl enable OpenGL rendering [no] --enable-openssl enable openssl [no] --enable-x11grab enable X11 grabbing [no] + --disable-xlib disable xlib [autodetect] --disable-zlib disable zlib [autodetect] Advanced options (experts only): @@ -1333,6 +1334,7 @@ EXTERNAL_LIBRARY_LIST=" opengl openssl x11grab + xlib zlib " @@ -2523,6 +2525,7 @@ enable swscale_alpha # Enable hwaccels by default. enable dxva2 vaapi vdpau xvmc +enable xlib # build settings SHFLAGS='-shared -Wl,-soname,$$(@F)' @@ -4398,7 +4401,8 @@ check_func_headers windows.h SetConsoleTextAttribute check_func_headers windows.h Sleep check_func_headers windows.h VirtualAlloc check_func_headers glob.h glob -check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext +enabled xlib && + check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext check_header cl/cl.h check_header direct.h @@ -4655,7 +4659,8 @@ if enabled libcdio; then die "ERROR: libcdio-paranoia not found" fi -check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib +enabled xlib && + check_lib X11/Xlib.h XOpenDisplay -lX11 || disable xlib enabled x11grab && require Xext X11/extensions/XShm.h XShmCreateImage -lXext && |