Update deps, small changes and cleanup

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

1 files changed, 5 insertions, 3 deletions

diff --git a/src/cache/meson.build b/src/cache/meson.build
index 816b101..8243893 100644
--- a/src/cache/meson.build
+++ b/src/cache/meson.build
@@ -8,7 +8,8 @@ cache_deps = []
 cache_args = []
 
 if 'file' in get_option('sources')
-  if naunet_has_mmap
+  # @TODO: file mapped vs non-mapped should be selectable at runtime.
+  if naunet_has_mmap and not is_android
     cache_src += ['backings/file_mapped.c']
   else
     cache_src += ['backings/file.c']
@@ -22,11 +23,12 @@ if 'http' in get_option('sources') and naunet_has_curl
 endif
 
 if 'cdio' in get_option('sources')
+  libcdio = dependency('libcdio', allow_fallback: true)
   libcdio_paranoia = dependency('libcdio_paranoia', allow_fallback: true)
   libcdio_cdda = dependency('libcdio_cdda', allow_fallback: true)
-  if libcdio_paranoia.found() and libcdio_cdda.found()
+  if libcdio.found() and libcdio_paranoia.found() and libcdio_cdda.found()
     cache_src += ['handlers/cdio.c']
-    cache_deps += [libcdio_paranoia, libcdio_cdda]
+    cache_deps += [libcdio, libcdio_paranoia, libcdio_cdda]
     cache_args += ['-DCACHE_HAVE_CDIO']
   endif
 endif