[vlc-commits] access: dvdnav: add additional version checking

[Tristan Matthews]

vlc/vlc-2.2 | branch: master | Tristan Matthews <tmatth at videolan.org> | Mon Aug 31 16:01:25 2015 -0400| [20e0f73e8e94785cd464a1bf50fc06d789cea619] | committer: Jean-Baptiste Kempf

access: dvdnav: add additional version checking

Fixes #15357

(cherry picked from commit fc253a4ed78470f609049374e901fbf4e6ea286a)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.2.git/?a=commit;h=20e0f73e8e94785cd464a1bf50fc06d789cea619
---

 configure.ac            |    9 +++++++++
 modules/access/dvdnav.c |    2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/configure.ac b/configure.ac
index 35fb2df..057b089 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1704,6 +1704,15 @@ dnl
 dnl libdvdnav plugin
 dnl
 PKG_ENABLE_MODULES_VLC([DVDNAV], [], [dvdnav > 4.9.0], [DVD with navigation input module (dvdnav)], [auto])
+AS_IF([test "${enable_dvdnav}" != "no"], [
+  AC_MSG_CHECKING(for dvdnav_stream_cb in dvdnav/dvdnav.h)
+    AC_EGREP_HEADER(dvdnav_stream_cb,dvdnav/dvdnav.h,[
+      AC_MSG_RESULT(yes)
+      AC_DEFINE(HAVE_STREAM_CB_IN_DVDNAV_H, 1, For dvdnav demux support)
+      ],[
+      AC_MSG_RESULT(no)
+    ])
+])
 
 dnl
 dnl  Blu-ray Disc Support with libbluray
diff --git a/modules/access/dvdnav.c b/modules/access/dvdnav.c
index 2f08bbf..384401f 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -82,7 +82,7 @@
 static int  AccessDemuxOpen ( vlc_object_t * );
 static void Close( vlc_object_t * );
 
-#if DVDREAD_VERSION >= 50300
+#if DVDREAD_VERSION >= 50300 && defined( HAVE_STREAM_CB_IN_DVDNAV_H )
 #define HAVE_DVDNAV_DEMUX
 static int  DemuxOpen ( vlc_object_t * );
 #endif