[vlc-commits] Properly remove the old dvb plugin, fix bootstrapping

[Rémi Denis-Courmont]

vlc/vlc-2.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue Jan 24 18:55:31 2012 +0200| [03a9205f3016bd1be5ea12e43c902346d260ccc0] | committer: Rémi Denis-Courmont

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...)
(cherry picked from commit d0413f1d8b0f16001a6c0820a081ce81fedf6b65)

Conflicts:

	modules/access/Modules.am

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=03a9205f3016bd1be5ea12e43c902346d260ccc0
---

 configure.ac                  |    1 -
 modules/access/Modules.am     |    2 +-
 modules/access/dvb/Modules.am |    7 -------
 po/POTFILES.in                |    1 -
 4 files changed, 1 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8fb0670..636bf05 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4220,7 +4220,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 e595034..81d8e78 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -4,7 +4,7 @@
 LIBTOOL=@LIBTOOL@ --tag=CC
 
 BASE_SUBDIRS = mms rtp rtsp vcd vcdx screen bd 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
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 6f1669e..f5784e0 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -202,7 +202,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