Properly remove the old dvb plugin, fix bootstrapping

(I do not know why it was removed in the first place though - not me!
 As a consequence, we cannot scan TV channels in VLC >= 2.0...)

diff --git a/configure.ac b/configure.ac
index 52d8cf7222d10c62aec1aee109822f56fdd5a47d..b6675308a3c937f90270f0227e9297a43b360cf4 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4144,7 +4144,6 @@ AC_CONFIG_FILES([
   modules/access/Makefile
   modules/access/bd/Makefile
   modules/access/dshow/Makefile
-  modules/access/dvb/Makefile
   modules/access/mms/Makefile
   modules/access/rtp/Makefile
   modules/access/rtsp/Makefile

diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index bbf0c5ed555ce1954b7a7c5a09409dfaf9b8686b..ce69e25f5590b73bcff5fc1b54e554402ca3d193 100644 (file)
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -4,7 +4,7 @@
 LIBTOOL=@LIBTOOL@ --tag=CC
 
 BASE_SUBDIRS = bd mms rtp rtsp screen vcd vcdx zip
-EXTRA_SUBDIRS = dshow dvb
+EXTRA_SUBDIRS = dshow
 SUBDIRS = $(BASE_SUBDIRS)
 DIST_SUBDIRS = $(BASE_SUBDIRS) $(EXTRA_SUBDIRS)
 

diff --git a/modules/access/dvb/Modules.am b/modules/access/dvb/Modules.am
deleted file mode 100644 (file)
index aac6b86..0000000
--- a/modules/access/dvb/Modules.am
+++ /dev/null
@@ -1,7 +0,0 @@
-EXTRA_DIST += \
-       access.c \
-       http.c \
-       linux_dvb.c \
-       scan.c scan.h \
-       dvb.h \
-       $(NULL)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 1b4faf43fb9fb65bbc6c24827e5c65565a360248..7cf4ee89de294cbaad54ca7f2971393b951aac29 100644 (file)
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -200,7 +200,6 @@ modules/access/dshow/dshow.cpp
 modules/access/dshow/filter.cpp
 modules/access/dshow/filter.h
 modules/access/dtv/access.c
-modules/access/dvb/access.c
 modules/access/dv.c
 modules/access/dvdnav.c
 modules/access/dvdread.c