added qcam checks

Original commit message from CVS:
added qcam checks

diff --git a/configure.ac b/configure.ac
index cdf7627..b595119 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -405,6 +405,17 @@ dnl ==========================================================================
 dnl ========================= End macro definitions ==========================
 dnl ==========================================================================
 
+
+dnl Check for X11 extensions
+AC_PATH_XTRA
+if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
+  AC_MSG_ERROR(can not find X11)
+fi
+AC_SUBST(X_CFLAGS)
+AC_SUBST(X_PRE_LIBS)
+AC_SUBST(X_EXTRA_LIBS)
+AC_SUBST(X_LIBS)
+
 dnl ==========================================================================
 dnl ============================= sys plugins ================================
 dnl ==========================================================================
@@ -416,6 +427,10 @@ GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [
   AC_CHECK_HEADER(sys/soundcard.h, HAVE_OSS="yes", HAVE_OSS="no")
 ])
 
+dnl *** QuickCam ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_QCAM, true)
+GST_CHECK_FEATURE(QCAM, [QuickCam], qcamsrc, HAVE_QCAM="yes")
+
 dnl *** Video 4 Linux ***
 translit(dnm, m, l) AM_CONDITIONAL(USE_V4L, true)
 GST_CHECK_FEATURE(V4L, [Video 4 Linux], v4lsrc, [
@@ -434,7 +449,11 @@ GST_CHECK_FEATURE(VGA, [VGA], vgavideosink, [
   AC_CHECK_HEADER(asm/vga.h, HAVE_VGA="yes", HAVE_VGA="no")
 ])
 
-
+dnl *** XVideo ***
+translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true)
+GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink, [
+  GST_CHECK_LIBHEADER(XVIDEO, Xv, XvQueryExtension, $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS, X11/extensions/Xvlib.h)
+])
 
 dnl Next, check for the optional libraries:
 dnl These are all libraries used in building plugins
@@ -747,28 +766,6 @@ main() { atomic_t t; atomic_set(&t,0); atomic_inc(&t); atomic_add(1,&t);return 0
 fi
 
 
-dnl Check for X11 extensions
-AC_PATH_XTRA
-if test "-DX_DISPLAY_MISSING" = "$X_CFLAGS"; then
-  AC_MSG_ERROR(can not find X11)
-fi
-AC_SUBST(X_CFLAGS)
-AC_SUBST(X_PRE_LIBS)
-AC_SUBST(X_EXTRA_LIBS)
-AC_SUBST(X_LIBS)
-
-
-dnl Check for the Xv library
-xvsave_LIBS=${LIBS}
-AC_CHECK_LIB(Xv, XvQueryExtension,
-  HAVE_LIBXV=yes,
-  HAVE_LIBXV=no,
-  $X_LIBS $X_PRE_LIBS -lXext -lX11 $X_EXTRA_LIBS
-)
-LIBS=${xvsave_LIBS}
-AC_CHECK_HEADER(X11/extensions/Xv.h, :, HAVE_LIBXV=no)
-AC_CHECK_HEADER(X11/extensions/Xvlib.h, :, HAVE_LIBXV=no)
-
 
 dnl ######################################################################
 dnl # Check command line parameters, and set shell variables accordingly #

diff --git a/sys/Makefile.am b/sys/Makefile.am
index 256abfe..2054a4a 100644 (file)
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -5,6 +5,12 @@ else
 OSS_SUBDS=
 endif
 
+if USE_QCAM
+QCAM_SUBDS=qcam
+else
+QCAM_SUBDS=
+endif
+
 if USE_V4L
 V4L_SUBDS=v4l
 else
@@ -23,7 +29,14 @@ else
 VGA_SUBDS=
 endif
 
-SUBDIRS=$(OSS_SUBDS) qcam $(V4L_SUBDS) $(VCD_SUBDS) $(VGA_SUBDS) xvideo
+if USE_XVIDEO
+XVIDEO_SUBDS=xvideo
+else
+XVIDEO_SUBDS=
+endif
+
+SUBDIRS=$(OSS_SUBDS) $(QCAM_SUBDS) $(V4L_SUBDS) $(VCD_SUBDS) \
+       $(VGA_SUBDS) $(XVIDEO_SUBDS)
 
 DIST_SUBDIRS=oss qcam v4l vcd vga xvideo