From 5a18818b13d8b49b8ff1d08be99cfd268abc7acb Mon Sep 17 00:00:00 2001
From: Andre Pang <athp@users.sourceforge.net>
Date: Wed, 20 Oct 2004 05:02:55 +0000
Subject: Enable dvdnav support even if CDROM ioctls are not found.  This makes
 xine work with DVDs on Mac OS X: please test on other platforms to ensure
 there are no regressions.

CVS patchset: 7053
CVS date: 2004/10/20 05:02:55
---
 src/input/Makefile.am | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

(limited to 'src')

diff --git a/src/input/Makefile.am b/src/input/Makefile.am
index 1f950075d..876334d78 100644
--- a/src/input/Makefile.am
+++ b/src/input/Makefile.am
@@ -17,13 +17,7 @@ libdir = $(XINE_PLUGINDIR)
 #
 
 if HAVE_CDROM_IOCTLS
-in_dvd = xineplug_inp_dvd.la
-## build both vcd for now
-##if ENABLE_VCD
-##else
 in_vcd = xineplug_inp_vcdo.la
-##endif
-#in_cda = xineplug_inp_cda.la
 endif
 
 if HAVE_V4L
@@ -40,6 +34,7 @@ in_smb = xineplug_inp_smb.la
 endif
 
 # For DVD
+in_dvd = xineplug_inp_dvd.la
 if HAVE_DVDNAV
 DVD_CFLAGS = $(DVDNAV_CFLAGS)
 link_dvdnav = $(DVDNAV_LIBS)
-- 
cgit v1.2.3