* Another mistake in the BSD/OS configuration process.

configure.in

@@ -261,8 +261,9 @@ AC_CHECK_HEADERS(sys/ioctl.h,[
     dnl
     AC_CHECK_HEADERS(/sys/dev/scsi/scsi_ioctl.h,[
       NEED_BSDI_LIBDVD=1
+      AC_DEFINE(DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H, 1,
+                Define if <extras/BSDI_dvdioctl/dvd.h> defines DVD_STRUCT.)
       OBJ_LIBDVDCSS="${OBJ_LIBDVDCSS} bsdi_dvdioctl.o"
-      CFLAGS_LIBDVDCSS="${CFLAGS_LIBDVDCSS} -I../BSDI_ioctl"
       LINUX_DVD_STRUCT=1
     ])
   ])

extras/libdvdcss/ioctl.c

@@ -2,7 +2,7 @@
  * ioctl.c: DVD ioctl replacement function
  *****************************************************************************
  * Copyright (C) 1999-2001 VideoLAN
- * $Id: ioctl.c,v 1.10 2001/08/09 23:12:36 sam Exp $
+ * $Id: ioctl.c,v 1.11 2001/08/10 17:43:50 sam Exp $
  *
  * Authors: Markus Kuespert <ltlBeBoy@beosmail.com>
  *          Samuel Hocevar <sam@zoy.org>
@@ -52,6 +52,9 @@
 #ifdef DVD_STRUCT_IN_DVD_H
 #   include <dvd.h>
 #endif
+#ifdef DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H
+#   include <BSDI_dvdioctl/dvd.h>
+#endif
 #ifdef SYS_BEOS
 #   include <malloc.h>
 #   include <scsi.h>

include/defs.h.in

@@ -58,6 +58,9 @@
 /* Define if you have the vasprintf function.  */
 #undef HAVE_VASPRINTF
 
+/* Define if you have the </sys/dev/scsi/scsi_ioctl.h> header file.  */
+#undef HAVE__SYS_DEV_SCSI_SCSI_IOCTL_H
+
 /* Define if you have the <Carbon/Carbon.h> header file.  */
 #undef HAVE_CARBON_CARBON_H
 
@@ -190,6 +193,9 @@
 /* Define if <dvd.h> defines DVD_STRUCT. */
 #undef DVD_STRUCT_IN_DVD_H
 
+/* Define if <extras/BSDI_dvdioctl/dvd.h> defines DVD_STRUCT. */
+#undef DVD_STRUCT_IN_BSDI_DVDIOCTL_DVD_H
+
 /* Have userspace SCSI headers. */
 #undef SOLARIS_USCSI