diff options
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | sys/Makefile.am | 20 |
2 files changed, 19 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac index 6037801e..1e079ac7 100644 --- a/configure.ac +++ b/configure.ac @@ -416,6 +416,12 @@ GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [ AC_CHECK_HEADER(sys/soundcard.h, HAVE_OSS="yes", HAVE_OSS="no") ]) +dnl *** Video 4 Linux *** +translit(dnm, m, l) AM_CONDITIONAL(USE_V4L, true) +GST_CHECK_FEATURE(V4L, [Video 4 Linux], v4lsrc, [ + AC_CHECK_HEADER(linux/videodev.h, HAVE_V4L="yes", HAVE_V4L="no") +]) + dnl *** VGA *** translit(dnm, m, l) AM_CONDITIONAL(USE_VGA, true) GST_CHECK_FEATURE(VGA, [VGA], vgavideosink, [ @@ -762,11 +768,6 @@ AC_CHECK_HEADER(linux/cdrom.h, HAVE_LINUX_CDROM=yes, HAVE_LINUX_CDROM=no ) -dnl Check for linux/videodev.h -AC_CHECK_HEADER(linux/videodev.h, - HAVE_LINUX_VIDEODEV=yes, HAVE_LINUX_VIDEODEV=no -) - dnl ###################################################################### dnl # Check command line parameters, and set shell variables accordingly # diff --git a/sys/Makefile.am b/sys/Makefile.am index 98297dc5..a88e2f9a 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -1,17 +1,23 @@ ### FIXME use HAVE_ stuff to decide on dirs -if USE_VGA -VGA_SUBDS=vga -else -VGA_SUBDS= -endif - if USE_OSS OSS_SUBDS=oss else OSS_SUBDS= endif -SUBDIRS=$(OSS_SUBDS) qcam v4l vcd $(VGA_SUBDS) xvideo +if USE_V4L +V4L_SUBDS=v4l +else +V4L_SUBDS= +endif + +if USE_VGA +VGA_SUBDS=vga +else +VGA_SUBDS= +endif + +SUBDIRS=$(OSS_SUBDS) qcam $(V4L_SUBDS) vcd $(VGA_SUBDS) xvideo DIST_SUBDIRS=oss qcam v4l vcd vga xvideo |