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.
This commit is contained in:
Sebastian Dröge 2019-04-22 12:51:33 +03:00
parent 7107fc5214
commit 8c994a632b
2 changed files with 2 additions and 2 deletions

View file

@ -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')) dvdread_dep = dependency('dvdread', version : '>= 0.5.0', required : get_option('dvdread'))
if gmodule_dep.found() and dvdread_dep.found() if gmodule_dep.found() and dvdread_dep.found()

View file

@ -155,6 +155,8 @@ else
cdata.set('DISABLE_ORC', 1) cdata.set('DISABLE_ORC', 1)
endif endif
gmodule_dep = dependency('gmodule-2.0', fallback : ['glib', 'libgmodule_dep'])
ugly_args = ['-DHAVE_CONFIG_H'] ugly_args = ['-DHAVE_CONFIG_H']
configinc = include_directories('.') configinc = include_directories('.')
libsinc = include_directories('gst-libs') libsinc = include_directories('gst-libs')