[grilo] build-sys: require same version for glib components
- From: Victor Toso <victortoso src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [grilo] build-sys: require same version for glib components
- Date: Wed, 25 Jul 2018 23:19:06 +0000 (UTC)
commit d2114dd7c5c22eb416fabdcf37a74c801c1309f6
Author: Victor Toso <me victortoso com>
Date: Wed Jul 25 14:03:29 2018 +0200
build-sys: require same version for glib components
As gio-2.0 requirement was 2.44 since 555654f4132801 we can use the
same version for all glib components:
- gobject-2.0
- gmodule-2.0
- gio-2.0
- glib-2.0
configure.ac | 12 +++++++-----
meson.build | 11 +++++++----
2 files changed, 14 insertions(+), 9 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 90ade6c..b74fe02 100644
--- a/configure.ac
+++ b/configure.ac
@@ -112,11 +112,13 @@ AC_DEFINE_UNQUOTED(GRL_PLUGINS_DIR, "$GRL_PLUGINS_DIR", [Plugins directory])
# DEPENDENCIES
# ----------------------------------------------------------
-PKG_CHECK_MODULES(DEPS, glib-2.0 >= 2.34 \
- gobject-2.0 \
- gmodule-2.0 \
- gio-2.0 >= 2.44\
- libxml-2.0)
+GLIB2_REQUIRED=2.44
+
+PKG_CHECK_MODULES(DEPS, glib-2.0 >= $GLIB2_REQUIRED \
+ gobject-2.0 >= $GLIB2_REQUIRED \
+ gmodule-2.0 >= $GLIB2_REQUIRED \
+ gio-2.0 >= $GLIB2_REQUIRED \
+ libxml-2.0)
GLIB_GENMARSHAL=`pkg-config --variable=glib_genmarshal glib-2.0`
diff --git a/meson.build b/meson.build
index cac3b9c..1d44bd2 100644
--- a/meson.build
+++ b/meson.build
@@ -37,10 +37,13 @@ grlpls_lt_version = '@0@.@1@.@2@'.format(soversion, current, grlpls_interface_ag
grl_majorminor = '@0@.@1@'.format(version_array[0], version_array[1])
grl_name = '@0@-@1@'.format(meson.project_name(), grl_majorminor)
-gio_dep = dependency('gio-2.0', version: '>= 2.44', required: true)
-glib_dep = dependency('glib-2.0', version: '>= 2.34', required: true)
-gmodule_dep = dependency('gmodule-2.0', required: true)
-gobject_dep = dependency('gobject-2.0', required: true)
+glib2_required = '2.44'
+glib2_required_info = '>= @0@'.format(glib2_required)
+
+gio_dep = dependency('gio-2.0', version: glib2_required_info, required: true)
+glib_dep = dependency('glib-2.0', version: glib2_required_info, required: true)
+gmodule_dep = dependency('gmodule-2.0', version: glib2_required_info, required: true)
+gobject_dep = dependency('gobject-2.0', version: glib2_required_info, required: true)
libxml_dep = dependency('libxml-2.0', required: true)
enable_grlnet = get_option('enable-grl-net')
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]