diff options
| author | Sebastian Dröge <sebastian@centricular.com> | 2019-04-22 12:51:33 +0300 |
|---|---|---|
| committer | Sebastian Dröge <sebastian@centricular.com> | 2019-04-22 12:51:33 +0300 |
| commit | 8c994a632b5190b41a66da37bb4508aff198ed10 (patch) | |
| tree | a00e2d30ab6381a9d231fca6036ef2507492d89e | |
| parent | 7107fc5214688eee329ae47180e09200cb2904da (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 092aaa17..0526f628 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') |