diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2019-04-22 12:51:33 +0300 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.com> | 2019-09-19 13:53:06 +0100 |
| commit | 3b7de7e3b1f424ba9c3c1afca60570e559464760 (patch) | |
| tree | b8afa409606987b054a78a6357c2a0303a96509c | |
| parent | 058d3c6cce46b5b4596eabdc23dbfcbf63d0c4e2 (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.build | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/ext/dvdread/meson.build b/ext/dvdread/meson.build index ae5a7a61..e3855722 100644 --- a/ext/dvdread/meson.build +++ b/ext/dvdread/meson.build @@ -1,5 +1,3 @@ -gmodule_dep = dependency('gmodule-2.0', fallback : ['glib', 'libgmodule_dep'], - required : get_option('dvdread')) dvdread_dep = dependency('dvdread', version : '>= 0.5.0', required : get_option('dvdread')) if gmodule_dep.found() and dvdread_dep.found() diff --git a/meson.build b/meson.build index e7fa48eb..9d770904 100644 --- a/meson.build +++ b/meson.build @@ -155,6 +155,8 @@ else cdata.set('DISABLE_ORC', 1) endif +gmodule_dep = dependency('gmodule-2.0', fallback : ['glib', 'libgmodule_dep']) + ugly_args = ['-DHAVE_CONFIG_H'] configinc = include_directories('.') libsinc = include_directories('gst-libs') |