summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorAndre Pang <athp@users.sourceforge.net>2004-10-20 05:02:55 +0000
committerAndre Pang <athp@users.sourceforge.net>2004-10-20 05:02:55 +0000
commit5a18818b13d8b49b8ff1d08be99cfd268abc7acb (patch)
tree9a186ac50204ffed36c21c4a7e14e538ad1da4d9 /configure.ac
parent6e3206aef0f424cfa65185ef7ca8c4f4ccebfde7 (diff)
downloadxine-lib-5a18818b13d8b49b8ff1d08be99cfd268abc7acb.tar.gz
xine-lib-5a18818b13d8b49b8ff1d08be99cfd268abc7acb.tar.bz2
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
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 7 insertions, 7 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)"