diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 13:38:41 +0200 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2007-04-04 13:38:41 +0200 |
| commit | 11256a884cae65ebfce0bc98cb5d034e431557c1 (patch) | |
| tree | 1b534fa41fb4149fdf1346afb31e6ee1086f6ffe | |
| parent | 76e028c87087ca9e897a1d3b564379e67e3ce58a (diff) | |
| download | xine-lib-11256a884cae65ebfce0bc98cb5d034e431557c1.tar.gz xine-lib-11256a884cae65ebfce0bc98cb5d034e431557c1.tar.bz2 | |
Check for sys/dvdio.h, and use that if found, rather than having a check for the BSDs.
Thanks to Pascal S. de Kloe for pointing at this.
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/input/input_dvd.c | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index c0b299ea3..dd4c18d0e 100644 --- a/configure.ac +++ b/configure.ac @@ -1649,7 +1649,8 @@ dnl --------------------------------------------- dnl cdrom ioctls dnl --------------------------------------------- -AC_CHECK_HEADERS(sys/cdio.h linux/cdrom.h) +AC_CHECK_HEADERS([linux/cdrom.h sys/dvdio.h], [break]) +AC_CHECK_HEADERS([sys/cdio.h]) AM_CHECK_CDROM_IOCTLS( [AC_DEFINE(HAVE_CDROM_IOCTLS,1,[Define this if you have CDROM ioctls])], [AC_MSG_RESULT([*** (S)VCD support will be disabled ***])]) diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index 944ae88bd..14ff8c9e8 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -64,11 +64,11 @@ #endif /* WIN32 */ -#if defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD__) +#if defined(HAVE_LINUX_CDROM_H) +#include <linux/cdrom.h> +#elif defined(HAVE_SYS_DVDIO_H) #include <sys/dvdio.h> #include <sys/cdio.h> /* CDIOCALLOW etc... */ -#elif defined(HAVE_LINUX_CDROM_H) -#include <linux/cdrom.h> #elif defined(HAVE_SYS_CDIO_H) #include <sys/cdio.h> #else |