From: Rémi Denis-Courmont <remi@remlab.net>
Date: Tue, 24 Jan 2012 16:55:31 +0000 (+0200)
Subject: Properly remove the old dvb plugin, fix bootstrapping
X-Git-Tag: 2.1.0-git~6139
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=d0413f1d8b0f16001a6c0820a081ce81fedf6b65;p=vlc

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 52d8cf7222..b6675308a3 100644
--- 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 bbf0c5ed55..ce69e25f55 100644
--- 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
index aac6b86f82..0000000000
--- 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 1b4faf43fb..7cf4ee89de 100644
--- 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