summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChristian Schaller <uraeus@gnome.org>2003-02-23 21:52:42 +0000
committerChristian Schaller <uraeus@gnome.org>2003-02-23 21:52:42 +0000
commit2980087e6a4fe5264136de6d033f8bb729d20a85 (patch)
treeeacaf14dbb2046bf27edc19169406517c9489b73
parent4344085222ab51582fc1ce7e4976b23a879d589d (diff)
downloadgst-plugins-bad-2980087e6a4fe5264136de6d033f8bb729d20a85.tar.gz
gst-plugins-bad-2980087e6a4fe5264136de6d033f8bb729d20a85.tar.bz2
gst-plugins-bad-2980087e6a4fe5264136de6d033f8bb729d20a85.zip
disabling videosink from head build, should I do the same for 0.6 branch?
Original commit message from CVS: disabling videosink from head build, should I do the same for 0.6 branch?
-rw-r--r--configure.ac3
-rw-r--r--sys/Makefile.am4
2 files changed, 3 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index 7c630989..3c977c9d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -365,7 +365,7 @@ dnl FIXME: perhaps warn user if they have a shared libXv since
dnl this is an error until XFree86 starts shipping one
translit(dnm, m, l) AM_CONDITIONAL(USE_XVIDEO, true)
-GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink videosink, [
+GST_CHECK_FEATURE(XVIDEO, [X11 XVideo extensions], xvideosink, [
dnl use X_CFLAGS for check
save_FLAGS=$CFLAGS
CFLAGS=$X_CFLAGS
@@ -1086,7 +1086,6 @@ sys/v4l2/Makefile
sys/vcd/Makefile
sys/vga/Makefile
sys/xvideo/Makefile
-sys/videosink/Makefile
ext/Makefile
ext/a52dec/Makefile
ext/aalib/Makefile
diff --git a/sys/Makefile.am b/sys/Makefile.am
index 6419b828..45ebd586 100644
--- a/sys/Makefile.am
+++ b/sys/Makefile.am
@@ -41,7 +41,7 @@ VGA_DIR=
endif
if USE_XVIDEO
-XVIDEO_DIR=xvideo videosink
+XVIDEO_DIR=xvideo
else
XVIDEO_DIR=
endif
@@ -55,4 +55,4 @@ endif
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
+DIST_SUBDIRS=dxr3 oss qcam v4l v4l2 vcd vga xvideo cdrom