diff -X vls-ignore.files -urN vls/Makefile.opts.in vls-cvs/Makefile.opts.in
--- vls/Makefile.opts.in	Thu Mar 21 19:56:38 2002
+++ vls-cvs/Makefile.opts.in	Fri Mar 22 11:57:16 2002
@@ -94,6 +94,11 @@
 
 CCFLAGS+=-DBUGGY_VLC
 
+#
+# Include directories
+#
+
+CCFLAGS+=@CFLAGS@
 
 ################################################################################
 # Build control
diff -X vls-ignore.files -urN vls/configure.in vls-cvs/configure.in
--- vls/configure.in	Thu Mar 21 19:56:38 2002
+++ vls-cvs/configure.in	Fri Mar 22 11:57:56 2002
@@ -264,14 +264,26 @@
   fi
 fi
 
-dnl 
+dnl
 dnl  DVB module
 dnl
 AC_ARG_ENABLE(dvb,
 [  --enable-dvb            DVB support (default disabled)])
+AC_ARG_WITH(dvb,
+[  --with-dvb=[PATH]       DVB driver header files (required when --enable-dvb is used) ])
 if test x$enable_dvb = xyes
 then
-  AC_CHECK_HEADERS(ost/sec.h ost/frontend.h ost/dmx.h,
+  dnl
+  dnl  Update CFLAGS with additional include path
+  dnl
+  if test "x$withval" != "xno"; then
+    if test -n $withval; then
+       CFLAGS_DVB="${CFLAGS_DVB} -I ${withval}"
+    fi
+    save_CFLAGS=$CFLAGS
+    CFLAGS="${save_CFLAGS} ${CFLAGS_DVB}"
+  fi
+  AC_CHECK_HEADERS(${withval}/ost/sec.h ${withval}/ost/frontend.h ${withval}/ost/dmx.h,
                   HAVE_DVB=1, HAVE_DVB=0)
   if test ${HAVE_DVB} = 1
   then
@@ -304,9 +316,7 @@
   fi
 fi
 
-
-
-dnl 
+dnl
 dnl  Configuration is finished
 dnl
 AC_SUBST(SYS)
@@ -323,6 +333,7 @@
 AC_SUBST(DEBUG)
 AC_SUBST(PROFILING)
 
+AC_SUBST(CFLAGS)
 AC_SUBST(CCFLAGS)
 AC_SUBST(DCFLAGS)
 AC_SUBST(LCFLAGS)