[FFmpeg-cvslog] configure: fix and simplify xlib check
James Almer
git at videolan.org
Mon May 7 02:47:51 EEST 2018
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Sun May 6 20:45:53 2018 -0300| [0736f32a4facddbd953977ca614a3ee6d8a6e1d7] | committer: James Almer
configure: fix and simplify xlib check
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=0736f32a4facddbd953977ca614a3ee6d8a6e1d7
---
configure | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/configure b/configure
index 6a69695e32..7c143238a8 100755
--- a/configure
+++ b/configure
@@ -3228,8 +3228,7 @@ v4l2_outdev_suggest="libv4l2"
vfwcap_indev_deps="vfw32 vfwcap_defines"
xcbgrab_indev_deps="libxcb"
xcbgrab_indev_suggest="libxcb_shm libxcb_shape libxcb_xfixes"
-xv_outdev_deps="X11_extensions_Xvlib_h XvGetPortAttribute"
-xv_outdev_extralibs="-lXv -lX11 -lXext"
+xv_outdev_deps="xlib"
# protocols
async_protocol_deps="threads"
@@ -5804,7 +5803,7 @@ check_func_headers windows.h Sleep
check_func_headers windows.h VirtualAlloc
check_func_headers glob.h glob
enabled xlib &&
- check_func_headers "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext
+ check_lib xlib "X11/Xlib.h X11/extensions/Xvlib.h" XvGetPortAttribute -lXv -lX11 -lXext
check_header direct.h
check_header dirent.h
More information about the ffmpeg-cvslog
mailing list