diff options
| -rw-r--r-- | stream/stream.c | 2 | ||||
| -rw-r--r-- | wscript | 4 | ||||
| -rw-r--r-- | wscript_build.py | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/stream/stream.c b/stream/stream.c index 94b9c44bc4..469e370fd3 100644 --- a/stream/stream.c +++ b/stream/stream.c @@ -93,7 +93,7 @@ static const stream_info_t *const stream_list[] = { #if HAVE_LIBSMBCLIENT &stream_info_smb, #endif -#if HAVE_DVDREAD +#if HAVE_DVDREAD || HAVE_DVDNAV &stream_info_ifo, &stream_info_dvd, #endif @@ -338,8 +338,8 @@ iconv support use --disable-iconv.", }, { 'name': '--dvdnav', 'desc': 'dvdnav support', - 'deps': [ 'dvdread' ], - 'func': check_pkg_config('dvdnav', '>= 4.2.0'), + 'func': check_pkg_config('dvdnav', '>= 4.2.0', + 'dvdread', '>= 4.1.0'), 'default': 'disable', }, { 'name': '--cdda', diff --git a/wscript_build.py b/wscript_build.py index 282ef5b4f1..e6f31ffc0d 100644 --- a/wscript_build.py +++ b/wscript_build.py @@ -260,7 +260,9 @@ def build(ctx): ( "stream/stream_cdda.c", "cdda" ), ( "stream/stream_dvb.c", "dvbin" ), ( "stream/stream_dvd.c", "dvdread" ), + ( "stream/stream_dvd.c", "dvdnav" ), ( "stream/stream_dvd_common.c", "dvdread" ), + ( "stream/stream_dvd_common.c", "dvdnav" ), ( "stream/stream_dvdnav.c", "dvdnav" ), ( "stream/stream_edl.c" ), ( "stream/stream_file.c" ), |