summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac11
-rw-r--r--sys/Makefile.am8
2 files changed, 13 insertions, 6 deletions
diff --git a/configure.ac b/configure.ac
index 1e079ac7..cdf76273 100644
--- a/configure.ac
+++ b/configure.ac
@@ -422,6 +422,12 @@ GST_CHECK_FEATURE(V4L, [Video 4 Linux], v4lsrc, [
AC_CHECK_HEADER(linux/videodev.h, HAVE_V4L="yes", HAVE_V4L="no")
])
+dnl *** Video CD ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_VCD, true)
+GST_CHECK_FEATURE(VCD, [Video CD], vcdsrc, [
+ AC_CHECK_HEADER(linux/cdrom.h, HAVE_VCD="yes", HAVE_VCD="no")
+])
+
dnl *** VGA ***
translit(dnm, m, l) AM_CONDITIONAL(USE_VGA, true)
GST_CHECK_FEATURE(VGA, [VGA], vgavideosink, [
@@ -763,11 +769,6 @@ LIBS=${xvsave_LIBS}
AC_CHECK_HEADER(X11/extensions/Xv.h, :, HAVE_LIBXV=no)
AC_CHECK_HEADER(X11/extensions/Xvlib.h, :, HAVE_LIBXV=no)
-dnl Check for linux/cdrom.h
-AC_CHECK_HEADER(linux/cdrom.h,
- HAVE_LINUX_CDROM=yes, HAVE_LINUX_CDROM=no
-)
-
dnl ######################################################################
dnl # Check command line parameters, and set shell variables accordingly #
diff --git a/sys/Makefile.am b/sys/Makefile.am
index a88e2f9a..256abfe7 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -11,13 +11,19 @@ else
V4L_SUBDS=
endif
+if USE_VCD
+VCD_SUBDS=vcd
+else
+VCD_SUBDS=
+endif
+
if USE_VGA
VGA_SUBDS=vga
else
VGA_SUBDS=
endif
-SUBDIRS=$(OSS_SUBDS) qcam $(V4L_SUBDS) vcd $(VGA_SUBDS) xvideo
+SUBDIRS=$(OSS_SUBDS) qcam $(V4L_SUBDS) $(VCD_SUBDS) $(VGA_SUBDS) xvideo
DIST_SUBDIRS=oss qcam v4l vcd vga xvideo