diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-07 17:31:35 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2010-03-07 17:31:35 +0000 |
| commit | 1df1992a4b5b23cabb2851fe902b214f6ceb9381 (patch) | |
| tree | e644ddc4fdfd741c57a2dd098691e260ffc86c99 /m4 | |
| parent | 755a021dd10786f564fba86be431f04017348128 (diff) | |
| parent | 82083a26798febc8184717d4b6a3eda94fb48925 (diff) | |
| download | xine-lib-1df1992a4b5b23cabb2851fe902b214f6ceb9381.tar.gz xine-lib-1df1992a4b5b23cabb2851fe902b214f6ceb9381.tar.bz2 | |
Merge from 1.1.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/input.m4 | 25 | ||||
| -rw-r--r-- | m4/summary.m4 | 1 |
2 files changed, 23 insertions, 3 deletions
diff --git a/m4/input.m4 b/m4/input.m4 index 04c480720..6165bd1be 100644 --- a/m4/input.m4 +++ b/m4/input.m4 @@ -13,6 +13,8 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ default_enable_gnomevfs=yes default_enable_samba=yes default_enable_v4l=no + default_enable_v4l2=no + default_enable_libv4l=no default_enable_vcd=yes default_enable_vcdo=no default_enable_vdr=yes @@ -30,17 +32,23 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ freebsd*) default_enable_vcdo=yes ;; + netbsd* | openbsd*) + default_enable_v4l2=yes + ;; linux*) default_enable_dvb=yes default_enable_v4l=yes + default_enable_v4l2=yes + default_enable_libv4l=yes default_enable_vcdo=yes ;; solaris*) default_enable_vcdo=yes + default_enable_v4l2=yes ;; esac - default_enable_libv4l="$default_enable_v4l" + dnl default_enable_libv4l="$default_enable_v4l2" dnl dvb XINE_ARG_ENABLE([dvb], [Enable support for the DVB plugin (Linux only)]) @@ -84,11 +92,22 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ XINE_ARG_ENABLE([v4l], [Enable Video4Linux support]) if test x"$enable_v4l" != x"no"; then have_v4l=yes - AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h], , [have_v4l=no]) + AC_CHECK_HEADERS([linux/videodev.h], , [have_v4l=no]) AC_CHECK_HEADERS([asm/types.h]) 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 + fi + AM_CONDITIONAL([ENABLE_V4L], [test x"$have_v4l" = x"yes"]) + + XINE_ARG_ENABLE([v4l2], [Enable Video4Linux 2 support]) + if test x"$enable_v4l2" != x"no"; then + have_v4l2=yes + AC_CHECK_HEADERS([linux/videodev2.h sys/videoio.h sys/videodev2.h], [have_v4l2=yes], []) + AC_CHECK_HEADERS([asm/types.h]) + if test x"$hard_enable_v4l2" = x"yes" && test x"$have_v4l2" != x"yes"; then + AC_MSG_ERROR([Video4Linux 2 support requested, but prerequisite headers not found.]) + fi XINE_ARG_ENABLE([libv4l], [Enable libv4l support]) if test "x$enable_libv4l" != "xno"; then PKG_CHECK_MODULES([V4L2], [libv4l2], @@ -100,7 +119,7 @@ AC_DEFUN([XINE_INPUT_PLUGINS], [ fi fi fi - AM_CONDITIONAL([ENABLE_V4L], [test x"$have_v4l" = x"yes"]) + AM_CONDITIONAL([ENABLE_V4L2], [test x"$have_v4l2" = x"yes"]) dnl dvdnav dnl XXX: This could be cleaned up so that code does not have to ifdef so much diff --git a/m4/summary.m4 b/m4/summary.m4 index 0acfc933a..c5b9a4132 100644 --- a/m4/summary.m4 +++ b/m4/summary.m4 @@ -29,6 +29,7 @@ AC_DEFUN([XINE_LIB_SUMMARY], [ test x"$have_gnomevfs" = x"yes" && echo " - gnome-vfs" test x"$have_samba" = x"yes" && echo " - smb" test x"$have_v4l" = x"yes" && echo " - v4l" + test x"$have_v4l2" = x"yes" && echo " - v4l2" echo " - cdda" echo "" |