diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-29 19:34:22 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-29 19:34:22 +0000 |
| commit | d7eebbd54d3883246d6ff8ba906846b57a1bfd92 (patch) | |
| tree | 16276c2141705c637527695e6770fcbbd08cdd6a /m4 | |
| parent | a588599bd24399e45f82fcb19b6a28fb6537771f (diff) | |
| parent | 81e86315a6966e172f4988f8925f830e01072c53 (diff) | |
| download | xine-lib-d7eebbd54d3883246d6ff8ba906846b57a1bfd92.tar.gz xine-lib-d7eebbd54d3883246d6ff8ba906846b57a1bfd92.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/input.m4 | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/m4/input.m4 b/m4/input.m4 index 2f5ceeec9..04c480720 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -90,8 +90,11 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ AC_MSG_ERROR([Video4Linux support requested, but prerequisite headers not found.]) fi XINE_ARG_ENABLE([libv4l], [Enable libv4l support]) - if test "x$enable_libv4l" != "xno"; then - AC_CHECK_HEADERS([libv4l2.h], [have_libv4l=yes], [have_libv4l=no]) + if test "x$enable_libv4l" != "xno"; then + PKG_CHECK_MODULES([V4L2], [libv4l2], + [have_libv4l=yes + AC_DEFINE([HAVE_LIBV4L2_H], [1], [Define this if you have libv4l installed])], + [have_libv4l=no]) if test "x$hard_enable_libv4l" = "xyes" && test "x$have_libv4l" = "xno"; then AC_MSG_ERROR([libv4l requested, but libv4l not found]) fi |