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.

diff --git a/ext/dvdread/meson.build b/ext/dvdread/meson.build
index ae5a7a611d9b765ec88c244228cb088ddfec208f..e385572273406b70bcd32c14b2bce615397faeae 100644 (file)
--- 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 e7fa48eb7eadeb7aedb46fd45fc2ce3a0ab67097..9d770904ffcc1b556e6e95c98afc51645c177bd7 100644 (file)
--- 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')