From fc253a4ed78470f609049374e901fbf4e6ea286a Mon Sep 17 00:00:00 2001
From: Tristan Matthews <tmatth@videolan.org>
Date: Mon, 31 Aug 2015 16:01:25 -0400
Subject: [PATCH] access: dvdnav: add additional version checking

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

diff --git a/configure.ac b/configure.ac
index 3ec70c3bf5..a9934a3906 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1698,6 +1698,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 654bb6772b..2e0315371c 100644
--- a/modules/access/dvdnav.c
+++ b/modules/access/dvdnav.c
@@ -80,7 +80,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