[FFmpeg-cvslog] configure: die if x11grab dependencies are unavailable

[Josh Allmann]

ffmpeg | branch: master | Josh Allmann <joshua.allmann at gmail.com> | Wed Mar 21 08:01:37 2012 -0700| [4a584edad7cd9be8241e8b6fe1fadf8340cd292b] | committer: Diego Biurrun

configure: die if x11grab dependencies are unavailable

Signed-off-by: Diego Biurrun <diego at biurrun.de>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4a584edad7cd9be8241e8b6fe1fadf8340cd292b
---

 configure |   12 ++++--------
 1 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/configure b/configure
index 34a5f12..8c227aa 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