diff options
| author | Juergen Keil <jkeil@users.sourceforge.net> | 2001-07-17 13:28:10 +0000 |
|---|---|---|
| committer | Juergen Keil <jkeil@users.sourceforge.net> | 2001-07-17 13:28:10 +0000 |
| commit | d55a686c1b54f6894685c17c648c3f1dbf2b5e78 (patch) | |
| tree | 6bdd75823b6dc8c84418a9fc93a3c846ce1e038c | |
| parent | 50ce564235215b90890b81fcdcf10603df898fd6 (diff) | |
| download | xine-lib-d55a686c1b54f6894685c17c648c3f1dbf2b5e78.tar.gz xine-lib-d55a686c1b54f6894685c17c648c3f1dbf2b5e78.tar.bz2 | |
AM_CHECK_CDROM_IOCTLS, add test for Solaris cdrom ioctls.
Fix typo in input_dvd.c/input_vcd.c (HAVE_SYS_CDIO -> HAVE_SYS_CDIO_H)
CVS patchset: 290
CVS date: 2001/07/17 13:28:10
| -rw-r--r-- | m4/_xine.m4 | 2 | ||||
| -rw-r--r-- | src/input/input_dvd.c | 4 | ||||
| -rw-r--r-- | src/input/input_vcd.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/m4/_xine.m4 b/m4/_xine.m4 index 6d89dfd97..187d4f1a5 100644 --- a/m4/_xine.m4 +++ b/m4/_xine.m4 @@ -147,7 +147,7 @@ AC_DEFUN([AM_CHECK_CDROM_IOCTLS], #ifdef HAVE_LINUX_CDROM_H # include <linux/cdrom.h> #endif -#if defined(CDROM_DRIVE_STATUS) || defined(CDIOCALLOW) +#if defined(CDROM_DRIVE_STATUS) || defined(CDIOCALLOW) || defined(CDROMCDXA) we_have_cdrom_ioctls #endif ], diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c index bbd302ca4..fb8f198ba 100644 --- a/src/input/input_dvd.c +++ b/src/input/input_dvd.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_dvd.c,v 1.14 2001/07/16 19:36:00 mshopf Exp $ + * $Id: input_dvd.c,v 1.15 2001/07/17 13:28:10 jkeil Exp $ */ #ifdef HAVE_CONFIG_H @@ -41,7 +41,7 @@ # include <linux/config.h> /* Check for DEVFS */ # include <linux/cdrom.h> #endif -#if ! defined (HAVE_LINUX_CDROM_H) && ! defined (HAVE_SYS_CDIO) +#if ! defined (HAVE_LINUX_CDROM_H) && ! defined (HAVE_SYS_CDIO_H) #error "you need to add cdrom / VCD support for your platform to input_vcd and configure.in" #endif diff --git a/src/input/input_vcd.c b/src/input/input_vcd.c index 89e08eee0..2058f63ad 100644 --- a/src/input/input_vcd.c +++ b/src/input/input_vcd.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: input_vcd.c,v 1.14 2001/07/16 19:36:00 mshopf Exp $ + * $Id: input_vcd.c,v 1.15 2001/07/17 13:28:10 jkeil Exp $ */ #ifdef HAVE_CONFIG_H @@ -43,7 +43,7 @@ # include <sys/cdrio.h> # endif #endif -#if ! defined (HAVE_LINUX_CDROM_H) && ! defined (HAVE_SYS_CDIO) +#if ! defined (HAVE_LINUX_CDROM_H) && ! defined (HAVE_SYS_CDIO_H) #error "you need to add cdrom / VCD support for your platform to input_vcd and configure.in" #endif |