meson: Always use a dependency object for dependencies

Fixes a configure error with gst-build:

subprojects/gst-plugins-base/meson.build:235:2: ERROR:  Fetched variable 'gst_check_dep' in the subproject 'gstreamer' is not a dependency object.

diff --git a/libs/gst/meson.build b/libs/gst/meson.build
index 0313c0a81ae53cb0ff858f4f17d50848d0bf8e87..33ecc2c2746c6bd08eae361869589b18d83b6594 100644 (file)
--- a/libs/gst/meson.build
+++ b/libs/gst/meson.build
@@ -4,7 +4,7 @@ subdir('net')
 subdir('helpers')
 
 if get_option('check').disabled()
-  gst_check_dep = disabler() # KISS for now
+  gst_check_dep = dependency('', required : false)
 else
   subdir('check')
 endif

diff --git a/tests/meson.build b/tests/meson.build
index e97724fb30be26317bd8300de7d643c7eb3e3e70..324355c1e52178fc1bbafa90fba806a582bb164c 100644 (file)
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -1,7 +1,7 @@
 if not get_option('benchmarks').disabled()
   subdir('benchmarks')
 endif
-if not get_option('tests').disabled()
+if not get_option('tests').disabled() and gst_check_dep.found()
   subdir('check')
 endif
 if not get_option('examples').disabled()