Big build update

Signed-off-by: Andrew Opalach <andrew@akon.city>

1 files changed, 19 insertions, 16 deletions

diff --git a/src/cache/meson.build b/src/cache/meson.build
index 5b70c3c..9c9af7b 100644
--- a/src/cache/meson.build
+++ b/src/cache/meson.build
@@ -8,6 +8,16 @@ cache_src = [
 cache_deps = []
 cache_args = []
 
+if naunet_has_mmap
+  cache_src += ['backings/file_mapped.c']
+else
+  cache_src += ['backings/file.c']
+endif
+
+if naunet_has_curl
+  cache_src += ['handlers/http.c']
+endif
+
 cache_have_cdio = false
 libcdio_paranoia = dependency('libcdio_paranoia', required: false, allow_fallback: true)
 libcdio_cdda = dependency('libcdio_cdda', required: false, allow_fallback: true)
@@ -18,21 +28,14 @@ if libcdio_paranoia.found() and libcdio_cdda.found()
   cache_have_cdio = true
 endif
 
-#libdvdcss = dependency('libdvdcss', required: false, allow_fallback: true)
-#libdvdread = dependency('libdvdread', required: false, allow_fallback: true)
-#libdvdnav = dependency('libdvdnav', required: false, allow_fallback: true)
-#if libdvdcss.found() and libdvdread.found() and libdvdnav.found()
-#endif
-
-if naunet_has_mmap
-  cache_src += ['backings/file_mapped.c']
-else
-  cache_src += ['backings/file.c']
-endif
-
-if naunet_has_curl
-  cache_src += ['handlers/http.c']
+cache_have_libdvd = false
+libdvdcss = dependency('libdvdcss', required: false, allow_fallback: true)
+libdvdread = dependency('dvdread', required: false, allow_fallback: true)
+libdvdnav = dependency('dvdnav', required: false, allow_fallback: true)
+if libdvdcss.found() and libdvdread.found() and libdvdnav.found()
+  cache_deps += [libdvdcss, libdvdread, libdvdnav]
+  cache_args += ['-DCACHE_HAVE_LIBDVD']
+  cache_have_libdvd = true
 endif
 
-cache = declare_dependency(sources: cache_src, dependencies: cache_deps,
-    compile_args: cache_args)
+cache = declare_dependency(sources: cache_src, dependencies: cache_deps, compile_args: cache_args)