* ./configure.in, ./plugins/mpeg_system/mpeg_ts.c: fixed libdvbpsi handling.

   (what? frozen? sorry, I can't hear you)

ChangeLog

@@ -9,6 +9,7 @@ HEAD
 0.4.1
 Mon,  3 Jun 2002 23:43:35 +0200
 
+  * ./configure.in, ./plugins/mpeg_system/mpeg_ts.c: fixed libdvbpsi handling.
   * ./src/misc/configuration.c: fixed the --nofoo option handling.
   * ./src/interface/main.c: fixed two compilation warnings under Solaris.
   * ./plugins/avi/avi.c, ./plugins/mpeg_system/mpeg_audio.c: ES will be

configure

@@ -6087,7 +6087,7 @@ fi
   x|xyes)
     if test "x$with_dvbpsi_tree" = x
     then
-      for ac_hdr in src/descriptors/dr.h
+      for ac_hdr in dvbpsi/dr.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
@@ -6121,7 +6121,7 @@ if eval "test \"`echo '$ac_cv_header_'$ac_safe`\" = yes"; then
   cat >> confdefs.h <<EOF
 #define $ac_tr_hdr 1
 EOF
-  PLUGINS="${PLUGINS} dvbpsi"
+  PLUGINS="${PLUGINS} mpeg_ts_dvbpsi"
           mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} -ldvbpsi" 
 else
   echo "$ac_t""no" 1>&6

configure.in

@@ -725,8 +725,8 @@ then
   x|xyes)
     if test "x$with_dvbpsi_tree" = x
     then
-      AC_CHECK_HEADERS(src/descriptors/dr.h,
-        [ PLUGINS="${PLUGINS} dvbpsi"
+      AC_CHECK_HEADERS(dvbpsi/dr.h,
+        [ PLUGINS="${PLUGINS} mpeg_ts_dvbpsi"
           mpeg_ts_dvbpsi_LDFLAGS="${mpeg_ts_dvbpsi_LDFLAGS} -ldvbpsi" ], [],
         [  AC_MSG_ERROR([cannot find libdvbpsi headers]) ])
     else

include/defs.h.in

@@ -190,6 +190,9 @@
 /* Define if you have the <dlfcn.h> header file.  */
 #undef HAVE_DLFCN_H
 
+/* Define if you have the <dvbpsi/dr.h> header file.  */
+#undef HAVE_DVBPSI_DR_H
+
 /* Define if you have the <dvdcss/dvdcss.h> header file.  */
 #undef HAVE_DVDCSS_DVDCSS_H
 
@@ -268,9 +271,6 @@
 /* Define if you have the <soundcard.h> header file.  */
 #undef HAVE_SOUNDCARD_H
 
-/* Define if you have the <src/descriptors/dr.h> header file.  */
-#undef HAVE_SRC_DESCRIPTORS_DR_H
-
 /* Define if you have the <stddef.h> header file.  */
 #undef HAVE_STDDEF_H
 

plugins/mpeg_system/mpeg_ts.c

@@ -2,7 +2,7 @@
  * mpeg_ts.c : Transport Stream input module for vlc
  *****************************************************************************
  * Copyright (C) 2000-2001 VideoLAN
- * $Id: mpeg_ts.c,v 1.13 2002/05/21 01:27:26 sam Exp $
+ * $Id: mpeg_ts.c,v 1.13.2.1 2002/06/03 23:14:49 sam Exp $
  *
  * Authors: Henri Fallon <henri@via.ecp.fr>
  *          Johan Bilien <jobi@via.ecp.fr>
@@ -39,12 +39,21 @@
 #include "iso_lang.h"
 
 #if defined MODULE_NAME_IS_mpeg_ts_dvbpsi
-#include <dvbpsi/dvbpsi.h>
-#include <dvbpsi/descriptor.h>
-#include <dvbpsi/pat.h>
-#include <dvbpsi/pmt.h>
-#include <dvbpsi/dr.h>
+#   ifdef HAVE_DVBPSI_DR_H
+#       include <dvbpsi/dvbpsi.h>
+#       include <dvbpsi/descriptor.h>
+#       include <dvbpsi/pat.h>
+#       include <dvbpsi/pmt.h>
+#       include <dvbpsi/dr.h>
+#   else
+#       include "dvbpsi.h"
+#       include "descriptor.h"
+#       include "tables/pat.h"
+#       include "tables/pmt.h"
+#       include "descriptors/dr.h"
+#   endif
 #endif
+
 /*****************************************************************************
  * Constants
  *****************************************************************************/