summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian@centricular.com>2019-04-22 12:51:33 +0300
committerSebastian Dröge <sebastian@centricular.com>2019-05-02 16:34:12 +0300
commita2f9d4151bd98f54ec9a6ed004897275ffcde70c (patch)
treebece1973d10c5fc0f4173e9845d9cf315ca1d98e
parentf2752a428775b0dbaae39b166b284a0d32179284 (diff)
meson: Always require the gmodule dependency
It's needed by the dvdread plugin but also by the x264 plugin in certain circumstances. As it's part of GLib and always available, simply move it as a hard dependency to the top-level meson.build.
-rw-r--r--ext/dvdread/meson.build1
-rw-r--r--meson.build2
2 files changed, 2 insertions, 1 deletions
diff --git a/ext/dvdread/meson.build b/ext/dvdread/meson.build
index 203f89e3..4b6bea3f 100644
--- a/ext/dvdread/meson.build
+++ b/ext/dvdread/meson.build
@@ -1,4 +1,3 @@
-gmodule_dep = dependency('gmodule-2.0', required : false)
dvdread_dep = dependency('dvdread', version : '>= 0.5.0', required : false)
if gmodule_dep.found() and dvdread_dep.found()
diff --git a/meson.build b/meson.build
index a007a7e3..8fb305d7 100644
--- a/meson.build
+++ b/meson.build
@@ -170,6 +170,8 @@ else
cdata.set('DISABLE_ORC', 1)
endif
+gmodule_dep = dependency('gmodule-2.0', fallback : ['glib', 'libgmodule_dep'])
+
configure_file(output : 'config.h', configuration : cdata)
ugly_args = ['-DHAVE_CONFIG_H']