aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Allmann <joshua.allmann@gmail.com>2012-03-21 08:01:37 -0700
committerDiego Biurrun <diego@biurrun.de>2012-03-23 12:10:41 +0100
commit4a584edad7cd9be8241e8b6fe1fadf8340cd292b (patch)
tree69200fde1c0905a2997fea8b1a0239ed81b7142c
parentafa612901615cca6c0160b5e6c18ffcacf0add46 (diff)
downloadffmpeg-4a584edad7cd9be8241e8b6fe1fadf8340cd292b.tar.gz
configure: die if x11grab dependencies are unavailable
Signed-off-by: Diego Biurrun <diego@biurrun.de>
-rwxr-xr-xconfigure12
1 files changed, 4 insertions, 8 deletions
diff --git a/configure b/configure
index 34a5f12ab2..8c227aae92 100755
--- a/configure
+++ b/configure
@@ -1496,7 +1496,6 @@ v4l2_indev_deps_any="linux_videodev2_h sys_videoio_h"
vfwcap_indev_deps="capCreateCaptureWindow vfwcap_defines"
vfwcap_indev_extralibs="-lavicap32"
x11_grab_device_indev_deps="x11grab XShmCreateImage"
-x11_grab_device_indev_extralibs="-lX11 -lXext -lXfixes"
# protocols
gopher_protocol_deps="network"
@@ -3026,13 +3025,10 @@ enabled_any sndio_indev sndio_outdev && check_lib2 sndio.h sio_open -lsndio
enabled libcdio &&
check_lib2 "cdio/cdda.h cdio/paranoia.h" cdio_cddap_open "-lcdio_paranoia -lcdio_cdda -lcdio"
-enabled x11grab &&
-check_header X11/Xlib.h &&
-check_header X11/extensions/XShm.h &&
-check_header X11/extensions/Xfixes.h &&
-check_func XOpenDisplay -lX11 &&
-check_func XShmCreateImage -lX11 -lXext &&
-check_func XFixesGetCursorImage -lX11 -lXext -lXfixes
+enabled x11grab &&
+require X11 X11/Xlib.h XOpenDisplay -lX11 &&
+require Xext X11/extensions/XShm.h XShmCreateImage -lXext &&
+require Xfixes X11/extensions/Xfixes.h XFixesGetCursorImage -lXfixes
# check for VDA header
if ! disabled vda && check_header VideoDecodeAcceleration/VDADecoder.h; then