meson: Fix detection of cdparanoia library

Without this the pkg-config file is required when the plugin is enabled.

diff --git a/ext/cdparanoia/meson.build b/ext/cdparanoia/meson.build
index 364b57c..5166fbf 100644 (file)
--- a/ext/cdparanoia/meson.build
+++ b/ext/cdparanoia/meson.build
@@ -1,15 +1,18 @@
 cdparanoia_deps = []
 cdparanoia_found = false
+cdparanoia_option = get_option('cdparanoia')
+if cdparanoia_option.disabled()
+  subdir_done()
+endif
 
 # cdparanoia upstream has a pkg-config file only in post-10.2 SVN so far, no release yet
-cdparanoia_dep = dependency('cdparanoia-3', version : '>=10.2',
-                            required : get_option('cdparanoia'))
+cdparanoia_dep = dependency('cdparanoia-3', version : '>=10.2', required : false)
 if cdparanoia_dep.found()
   cdparanoia_deps = [cdparanoia_dep]
   cdparanoia_found = true
 else
-  cdparanoia_dep = cc.find_library('cdda_paranoia', required : get_option('cdparanoia'))
-  cdinterface_dep = cc.find_library('cdda_interface', required : get_option('cdparanoia'))
+  cdparanoia_dep = cc.find_library('cdda_paranoia', required : cdparanoia_option)
+  cdinterface_dep = cc.find_library('cdda_interface', required : cdparanoia_option)
   if cdparanoia_dep.found() and cdinterface_dep.found()
     cdparanoia_deps = [cdparanoia_dep, cdinterface_dep]
     cdparanoia_found = true
@@ -21,6 +24,10 @@ else
   endif
 endif
 
+if not cdparanoia_found and cdparanoia_option.enabled()
+  error('cdparanoia plugin enabled but library not found')
+endif
+
 if cdparanoia_found
   gstcdparanoia = library('gstcdparanoia',
     ['gstcdparanoiasrc.c'],