summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure4
-rw-r--r--libmpdemux/dvdauth.c2
-rw-r--r--libmpdvdkit2/dvd_reader.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/configure b/configure
index b656bb842f..7253775b2d 100755
--- a/configure
+++ b/configure
@@ -3106,7 +3106,7 @@ fi
echocheck "DVD support (libmpdvdkit)"
if test "$_dvdkit" = auto ; then
_dvdkit=no
- if linux || freebsd || netbsd || darwin || cygwin || openbsd || sunos; then
+ if linux || freebsd || netbsd || darwin || cygwin || openbsd || sunos || hpux; then
test -f "./libmpdvdkit2/Makefile" && _dvdkit=yes
test -f "./libmpdvdkit/Makefile" && _dvdkit=yes
fi
@@ -4711,7 +4711,7 @@ $_def_vcd
#define DEFAULT_CDROM_DEVICE "/vol/dev/aliases/cdrom0"
#define DEFAULT_DVD_DEVICE DEFAULT_CDROM_DEVICE
#elif defined(HPUX)
-#define DEFAULT_CDROM_DEVICE "/dev/cdrom:"
+#define DEFAULT_CDROM_DEVICE "/dev/cdrom"
#define DEFAULT_DVD_DEVICE "/dev/dvd"
#elif defined(WIN32)
#define DEFAULT_CDROM_DEVICE "D:"
diff --git a/libmpdemux/dvdauth.c b/libmpdemux/dvdauth.c
index 3266a383e6..bec9da5fc9 100644
--- a/libmpdemux/dvdauth.c
+++ b/libmpdemux/dvdauth.c
@@ -40,6 +40,8 @@
# include <linux/cdrom.h>
#elif defined(__sun)
# include <sun/dvdio.h>
+#elif defined(hpux)
+# include <sun/scsi.h>
#elif defined(__bsdi__)
# include <dvd.h>
#else
diff --git a/libmpdvdkit2/dvd_reader.c b/libmpdvdkit2/dvd_reader.c
index 59ebc546a6..36dfe0be7a 100644
--- a/libmpdvdkit2/dvd_reader.c
+++ b/libmpdvdkit2/dvd_reader.c
@@ -37,6 +37,8 @@
#if defined(__sun)
#include <sys/mnttab.h>
+#elif defined(hpux)
+#include </usr/conf/h/mnttab.h>
#elif defined(SYS_BSD)
#include <fstab.h>
#elif defined(__linux__)