diff options
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | sys/Makefile.am | 13 |
2 files changed, 16 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index 468ac942..7b8a8012 100644 --- a/configure.ac +++ b/configure.ac @@ -280,6 +280,12 @@ GST_CHECK_FEATURE(V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [ AC_CHECK_DECL(VID_TYPE_MPEG_ENCODER, HAVE_V4L="yes", HAVE_V4L="no", [#include <linux/videodev.h>]) ]) +dnl *** Video 4 Linux 2*** +translit(dnm, m, l) AM_CONDITIONAL(USE_V4L2, true) +GST_CHECK_FEATURE(V4L2, [Video 4 Linux 2], v4l2src, [ + AC_CHECK_HEADER(linux/videodev2.h, HAVE_V4L2="yes", HAVE_V4L2="no") +]) + dnl *** Video CD *** translit(dnm, m, l) AM_CONDITIONAL(USE_VCD, true) GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [ @@ -936,6 +942,7 @@ sys/dxr3/Makefile sys/oss/Makefile sys/qcam/Makefile sys/v4l/Makefile +sys/v4l2/Makefile sys/vcd/Makefile sys/vga/Makefile sys/xvideo/Makefile diff --git a/sys/Makefile.am b/sys/Makefile.am index aefb6481..6419b828 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -22,6 +22,12 @@ else V4L_DIR= endif +if USE_V4L2 +V4L2_DIR=v4l2 +else +V4L2_DIR= +endif + if USE_VCD VCD_DIR=vcd else @@ -46,8 +52,7 @@ else CDROM_DIR= endif -SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(VCD_DIR) \ - $(VGA_DIR) $(XVIDEO_DIR) $(CDROM_DIR) - -DIST_SUBDIRS=dxr3 oss qcam v4l vcd vga xvideo videosink cdrom +SUBDIRS=$(DXR3_DIR) $(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(V4L2_DIR) \ + $(VCD_DIR) $(VGA_DIR) $(XVIDEO_DIR) $(CDROM_DIR) +DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd vga xvideo videosink cdrom |