diff options
| -rw-r--r-- | configure.ac | 18 | ||||
| -rw-r--r-- | src/input/Makefile.am | 7 |
2 files changed, 23 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index c3270fec4..10c32d03c 100644 --- a/configure.ac +++ b/configure.ac @@ -676,10 +676,10 @@ dnl ---------------------------------------------- dnl Check for usable video-for-linux (v4l) support dnl ---------------------------------------------- AC_ARG_ENABLE([v4l], - AS_HELP_STRING([--disable-v4l], [do not build Video4Linux input plugin])) + AS_HELP_STRING([--disable-v4l], [do not build Video4Linux input plugins])) if test "x$enable_v4l" != "xno"; then - AC_CHECK_HEADERS([linux/videodev.h], [have_v4l=yes], [have_v4l=no]) + AC_CHECK_HEADERS([linux/videodev.h linux/videodev2.h], [have_v4l=yes], [have_v4l=no]) AC_CHECK_HEADERS([asm/types.h]) if test "x$enable_v4l" = "xyes" && test "x$have_v4l" = "xno"; then AC_MSG_ERROR([Video4Linux support requested, but prerequisite headers not found.]) @@ -689,6 +689,20 @@ fi AM_CONDITIONAL(HAVE_V4L, [test "x$have_v4l" = "xyes"]) dnl ---------------------------------------------- +dnl Check for libv4l support +dnl ---------------------------------------------- +AC_ARG_ENABLE([libv4l], + AS_HELP_STRING([--disable-libv4l], [do not build with 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" = "xyes" && test "x$have_libv4l" = "xno"; then + AC_MSG_ERROR([libv4l requested but not found.]) + fi +fi + + +dnl ---------------------------------------------- dnl Check for Xv and XvMC support dnl ---------------------------------------------- diff --git a/src/input/Makefile.am b/src/input/Makefile.am index 0748c8f29..3c700ea46 100644 --- a/src/input/Makefile.am +++ b/src/input/Makefile.am @@ -21,6 +21,7 @@ endif if HAVE_V4L in_v4l = xineplug_inp_v4l.la +in_v4l2 = xineplug_inp_v4l2.la in_pvr = xineplug_inp_pvr.la endif @@ -60,6 +61,7 @@ xineplug_LTLIBRARIES = \ $(in_dvd) \ $(in_vcd) \ $(in_v4l) \ + $(in_v4l2) \ $(in_gnome_vfs) \ $(in_smb) \ xineplug_inp_mms.la \ @@ -138,6 +140,11 @@ xineplug_inp_v4l_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) $(LTLIBINTL) xineplug_inp_v4l_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) xineplug_inp_v4l_la_LDFLAGS = -avoid-version -module +xineplug_inp_v4l2_la_SOURCES = input_v4l2.c +xineplug_inp_v4l2_la_LIBADD = $(XINE_LIB) $(ALSA_LIBS) +xineplug_inp_v4l2_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) +xineplug_inp_v4l2_la_LDFLAGS = -avoid-version -module + xineplug_inp_gnome_vfs_la_SOURCES = input_gnome_vfs.c net_buf_ctrl.c xineplug_inp_gnome_vfs_la_LIBADD = $(XINE_LIB) $(GNOME_VFS_LIBS) $(PTHREAD_LIBS) $(LTLIBINTL) xineplug_inp_gnome_la_CFLAGS = $(VISIBILITY_FLAG) $(AM_CFLAGS) |