Make buildable with current (external) libdvdnav & libdvdread.

7 files changed, 39 insertions, 11 deletions

diff --git a/ChangeLog b/ChangeLog
index 9eaa7df37..4ceef5fed 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ xine-lib (1.1.18.1) 2010-03-06
   * Fix a size check (wrong variable, causing int/ptr comparison) in rmff.c.
   * Fix build with the old, outdated and deprecated internal ffmpeg.
   * Handle odd widths properly (for ffmpeg-decoded video).
+  * Make buildable with current (external) libdvdnav & libdvdread.
 
 xine-lib (1.1.18) 2010-02-23
   * Bump the FLAC decoder's priority above ffmpegaudio. This should fix
diff --git a/m4/dvdnav.m4 b/m4/dvdnav.m4
index c15404168..a7f354b63 100644
--- a/m4/dvdnav.m4
+++ b/m4/dvdnav.m4
@@ -84,7 +84,7 @@ dnl checks the results of dvdnav-config to some extent
 dnl
       rm -f conf.dvdnavtest
       AC_RUN_IFELSE([AC_LANG_SOURCE([[
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
@@ -129,7 +129,7 @@ main ()
 ]])],[],[no_dvdnav=yes],[no_dvdnav=cc])
        if test "x$no_dvdnav" = xcc; then
          AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 ]], [[ return 0; ]])],[no_dvdnav=''],[no_dvdnav=yes])
        fi
@@ -140,6 +140,8 @@ main ()
     if test "x$no_dvdnav" = x ; then
        AC_MSG_RESULT(yes)
        ifelse([$2], , :, [$2])
+       dnl nav_*.h seem to have been moved from dvdnav at some point?
+       AC_CHECK_HEADERS([dvdread/nav_types.h])
     else
       AC_MSG_RESULT(no)
       if test "$DVDNAV_CONFIG" = "no" ; then
@@ -155,7 +157,7 @@ main ()
           CFLAGS="$CFLAGS $DVDNAV_CFLAGS"
           LIBS="$LIBS $DVDNAV_LIBS"
           AC_LINK_IFELSE([AC_LANG_PROGRAM([[
-#include <dvdnav.h>
+#include <dvdnav/dvdnav.h>
 #include <stdio.h>
 ]], [[ return 0; ]])],
         [ echo "*** The test program compiled, but did not run. This usually means"
diff --git a/src/dxr3/dxr3_decode_spu.c b/src/dxr3/dxr3_decode_spu.c
index e3d4f969b..683666d21 100644
--- a/src/dxr3/dxr3_decode_spu.c
+++ b/src/dxr3/dxr3_decode_spu.c
@@ -51,8 +51,13 @@
 #include "buffer.h"
 #include "xine-engine/bswap.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_types.h>
-#  include <dvdnav/nav_read.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#    include <dvdnav/nav_read.h>
+#  else
+#    include <dvdread/nav_types.h>
+#    include <dvdread/nav_read.h>
+#  endif
 #else
 #  include "nav_types.h"
 #  include "nav_read.h"
diff --git a/src/input/input_dvd.c b/src/input/input_dvd.c
index 400f82aca..27e49e05a 100644
--- a/src/input/input_dvd.c
+++ b/src/input/input_dvd.c
@@ -79,7 +79,13 @@
 /* DVDNAV includes */
 #ifdef HAVE_DVDNAV
 #  include <dvdnav/dvdnav.h>
-#  include <dvdnav/nav_read.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#    include <dvdnav/nav_read.h>
+#  else
+#    include <dvdread/nav_types.h>
+#    include <dvdread/nav_read.h>
+#  endif
 #else
 #  define DVDNAV_COMPILE
 #  include "dvdnav.h"
diff --git a/src/libspudec/spu.c b/src/libspudec/spu.c
index a9319f103..80d1eeaf5 100644
--- a/src/libspudec/spu.c
+++ b/src/libspudec/spu.c
@@ -57,8 +57,13 @@
 #include "buffer.h"
 #include "xine-engine/bswap.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_read.h>
-#  include <dvdnav/nav_print.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_read.h>
+#    include <dvdnav/nav_print.h>
+#  else
+#    include <dvdread/nav_read.h>
+#    include <dvdread/nav_print.h>
+#  endif
 #else
 #  include "nav_read.h"
 #  include "nav_print.h"
diff --git a/src/libspudec/spu.h b/src/libspudec/spu.h
index 54efe1968..a1bc5b971 100644
--- a/src/libspudec/spu.h
+++ b/src/libspudec/spu.h
@@ -33,7 +33,11 @@
 #include "video_out.h"
 #include "video_overlay.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_types.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#  else
+#    include <dvdread/nav_types.h>
+#  endif
 #else
 #  include "nav_types.h"
 #endif
diff --git a/src/libspudec/xine_spu_decoder.c b/src/libspudec/xine_spu_decoder.c
index 1f40dbb27..3d23bba21 100644
--- a/src/libspudec/xine_spu_decoder.c
+++ b/src/libspudec/xine_spu_decoder.c
@@ -39,8 +39,13 @@
 #include "xineutils.h"
 #include "spu.h"
 #ifdef HAVE_DVDNAV
-#  include <dvdnav/nav_read.h>
-#  include <dvdnav/nav_types.h>
+#  ifdef HAVE_DVDNAV_NAVTYPES_H
+#    include <dvdnav/nav_types.h>
+#    include <dvdnav/nav_read.h>
+#  else
+#    include <dvdread/nav_types.h>
+#    include <dvdread/nav_read.h>
+#  endif
 #else
 #  include "nav_read.h"
 #  include "nav_types.h"