diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-26 02:05:39 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-01-26 02:05:39 +0000 |
| commit | aba6adc0529ceed3406faabdc682efab035ef5ca (patch) | |
| tree | 7d9ab537c721cc0f8d218a08e91cf7a3b9bb7f01 /m4 | |
| parent | dcc02769693d66bbb703b082c3cde9174ade4a37 (diff) | |
| parent | 7a6f9b2927283b12d3438ad4fc60054650ac1554 (diff) | |
| download | xine-lib-aba6adc0529ceed3406faabdc682efab035ef5ca.tar.gz xine-lib-aba6adc0529ceed3406faabdc682efab035ef5ca.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/input.m4 | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/m4/input.m4 b/m4/input.m4 index 2e709312b..2f5ceeec9 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -40,6 +40,8 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ ;; esac + default_enable_libv4l="$default_enable_v4l" + dnl dvb XINE_ARG_ENABLE([dvb], [Enable support for the DVB plugin (Linux only)]) if test x"$enable_dvb" != x"no"; then @@ -87,10 +89,16 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ if test x"$hard_enable_v4l" = x"yes" && test x"$have_v4l" != x"yes"; then 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$hard_enable_libv4l" = "xyes" && test "x$have_libv4l" = "xno"; then + AC_MSG_ERROR([libv4l requested, but libv4l not found]) + fi + fi fi AM_CONDITIONAL([ENABLE_V4L], [test x"$have_v4l" = x"yes"]) - dnl dvdnav dnl XXX: This could be cleaned up so that code does not have to ifdef so much XINE_ARG_WITH([external-dvdnav], [Use external dvdnav library (not recommended)]) |