Commit e893440a authored by Michael Niedermayer's avatar Michael Niedermayer

configure: make it possible to disable xlib dependancy

The unconditional dependancy was added in 7671dd7cSigned-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent 9a05e8a3
...@@ -256,6 +256,7 @@ External library support: ...@@ -256,6 +256,7 @@ External library support:
--enable-opengl enable OpenGL rendering [no] --enable-opengl enable OpenGL rendering [no]
--enable-openssl enable openssl [no] --enable-openssl enable openssl [no]
--enable-x11grab enable X11 grabbing [no] --enable-x11grab enable X11 grabbing [no]
--disable-xlib disable xlib [autodetect]
--disable-zlib disable zlib [autodetect] --disable-zlib disable zlib [autodetect]
Advanced options (experts only): Advanced options (experts only):
...@@ -1333,6 +1334,7 @@ EXTERNAL_LIBRARY_LIST=" ...@@ -1333,6 +1334,7 @@ EXTERNAL_LIBRARY_LIST="
opengl opengl
openssl openssl
x11grab x11grab
xlib
zlib zlib
" "
...@@ -2523,6 +2525,7 @@ enable swscale_alpha ...@@ -2523,6 +2525,7 @@ enable swscale_alpha
# Enable hwaccels by default. # Enable hwaccels by default.
enable dxva2 vaapi vdpau xvmc enable dxva2 vaapi vdpau xvmc
enable xlib
# build settings # build settings
SHFLAGS='-shared -Wl,-soname,$$(@F)' SHFLAGS='-shared -Wl,-soname,$$(@F)'
...@@ -4398,7 +4401,8 @@ check_func_headers windows.h SetConsoleTextAttribute ...@@ -4398,7 +4401,8 @@ check_func_headers windows.h SetConsoleTextAttribute
check_func_headers windows.h Sleep check_func_headers windows.h Sleep
check_func_headers windows.h VirtualAlloc check_func_headers windows.h VirtualAlloc
check_func_headers glob.h glob 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 cl/cl.h
check_header direct.h check_header direct.h
...@@ -4655,7 +4659,8 @@ if enabled libcdio; then ...@@ -4655,7 +4659,8 @@ if enabled libcdio; then
die "ERROR: libcdio-paranoia not found" die "ERROR: libcdio-paranoia not found"
fi fi
check_lib X11/Xlib.h XOpenDisplay -lX11 && enable xlib enabled xlib &&
check_lib X11/Xlib.h XOpenDisplay -lX11 || disable xlib
enabled x11grab && enabled x11grab &&
require Xext X11/extensions/XShm.h XShmCreateImage -lXext && require Xext X11/extensions/XShm.h XShmCreateImage -lXext &&
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment