From: Tim-Philipp Müller <tim@centricular.com>
Date: Thu, 16 Aug 2018 09:58:47 +0000 (+0100)
Subject: meson: move gmodule check to top-level
X-Git-Tag: 1.19.3~511^2~1532
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=73828a1a5cdd9951bc95d9b6cbe477ba558ef133;p=platform%2Fupstream%2Fgstreamer.git

meson: move gmodule check to top-level

It's also needed by the generic/states test and the variable
is currently checked as part of the opengl lib tests so wouldn't
be available if opengl was disabled.
---

diff --git a/gst-libs/gst/gl/meson.build b/gst-libs/gst/gl/meson.build
index 4379a8d..e0bf5e7 100644
--- a/gst-libs/gst/gl/meson.build
+++ b/gst-libs/gst/gl/meson.build
@@ -136,8 +136,6 @@ foreach option : glconf_options
   glconf.set10(option, false)
 endforeach
 
-gmodule_dep = dependency('gmodule-no-export-2.0',
-  fallback: ['glib', 'libgmodule_dep'])
 unneeded_dep = dependency('', required : false)
 if unneeded_dep.found()
   error ('Found unfindable dependency')
diff --git a/meson.build b/meson.build
index d0873cd..9228868 100644
--- a/meson.build
+++ b/meson.build
@@ -235,6 +235,8 @@ glib_deps = [dependency('glib-2.0', version : glib_req, fallback: ['glib', 'libg
 gio_dep = dependency('gio-2.0', fallback: ['glib', 'libgio_dep'])
 giounix_dep = dependency('gio-unix-2.0', version : glib_req, required : host_system != 'windows',
                          fallback: ['glib', 'libgiounix_dep'])
+gmodule_dep = dependency('gmodule-no-export-2.0',
+                         fallback: ['glib', 'libgmodule_dep'])
 
 # some of the examples can use gdk-pixbuf and GTK+3
 gdk_pixbuf_dep = dependency('gdk-pixbuf-2.0', required : get_option('examples'))