From 9cecbd7a0e753fa0f5e9ab6e7a1598148e3e5890 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Mon, 15 May 2006 12:18:13 +0000 Subject: [PATCH] configure.ac: Build video4linux plugin even if there's no XVIDEO, just without implementing the GstXOverlay interface... Original commit message from CVS: * configure.ac: Build video4linux plugin even if there's no XVIDEO, just without implementing the GstXOverlay interface (#334002). --- ChangeLog | 6 ++++++ configure.ac | 14 ++++++++++---- 2 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 13f63132ec..5bbd5e4fd7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2006-05-15 Tim-Philipp Müller + + * configure.ac: + Build video4linux plugin even if there's no XVIDEO, just + without implementing the GstXOverlay interface (#334002). + 2006-05-15 Tim-Philipp Müller * configure.ac: diff --git a/configure.ac b/configure.ac index d0ad552c87..b9cd8ac2d3 100644 --- a/configure.ac +++ b/configure.ac @@ -346,16 +346,22 @@ dnl for information about the header/define, see sys/v4l/gstv4lelement.h dnl renamed to GST_V4L in accordance with V4L2 below translit(dnm, m, l) AM_CONDITIONAL(USE_GST_V4L, true) GST_CHECK_FEATURE(GST_V4L, [Video 4 Linux], v4lsrc v4lmjpegsrc v4lmjpegsink, [ - # first check X HAVE_GST_V4L="no" - if test "$HAVE_X" = "yes" - then - AC_CHECK_DECL(VID_TYPE_MPEG_ENCODER, HAVE_GST_V4L="yes", HAVE_GST_V4L="no", [ + AC_CHECK_DECL(VID_TYPE_MPEG_ENCODER, HAVE_GST_V4L="yes", HAVE_GST_V4L="no", [ #include #define _LINUX_TIME_H #define __user #include + ]) + + dnl we can build v4l without Xv, but then we won't have XOverlay support + if test "x$HAVE_GST_V4L" = "xyes" -a "x$HAVE_XVIDEO" != "xyes" + then + AC_MSG_NOTICE([ + ***** NO XVIDEO FOUND, VIDEO4LINUX WILL BE ***** + ***** BUILT WITHOUT XOVERLAY SUPPORT ***** ]) + sleep 3 fi ])