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
---
 configure.ac          | 14 +++++++-------
 src/input/Makefile.am |  7 +------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7b5974883..e8951b28c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1183,7 +1183,7 @@ dnl ---------------------------------------------
 AC_CHECK_HEADERS(sys/cdio.h linux/cdrom.h)
 AM_CHECK_CDROM_IOCTLS(
 	[AC_DEFINE(HAVE_CDROM_IOCTLS,1,[Define this if you have CDROM ioctls])],
-	[AC_MSG_RESULT([*** DVD and (S)VCD support will be disabled ***])])
+	[AC_MSG_RESULT([*** (S)VCD support will be disabled ***])])
 AM_CONDITIONAL(HAVE_CDROM_IOCTLS, [test x"$have_cdrom_ioctls" = "xyes"])
 
 
@@ -1340,7 +1340,7 @@ main() {
     LIBVCDINFO_LIBS='$(top_builddir)/src/input/vcd/libvcd/libvcdinfo.la'
 
     case $host_os in
-         darwin6*)
+         darwin*)
            AC_CHECK_HEADERS(IOKit/IOKitLib.h CoreFoundation/CFBase.h, 
                             [have_iokit_h="yes"])
            if test "x$have_iokit_h" = "xyes" ; then 
@@ -2271,12 +2271,12 @@ echo "   - stdin_fifo    - rtp"
 echo "   - http          - mms"
 echo "   - pnm           - rtsp"
 echo "   - dvb"
+if test x"$external_dvdnav" = "xyes"; then
+  echo "   - dvd (external libs)"
+else
+  echo "   - dvd (internal libs)"
+fi
 if test x"$have_cdrom_ioctls" = "xyes"; then
-  if test x"$external_dvdnav" = "xyes"; then
-    echo "   - dvd (external libs)"
-  else
-    echo "   - dvd (internal libs)"
-  fi
   if test x"$enable_vcd" = "xyes"; then
     if test x"$internal_vcdnav" = "xno"; then
       echo "   - vcd (external libs)"
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