diff options
| author | Victor Toso <me@victortoso.com> | 2018-07-25 23:37:14 +0200 |
|---|---|---|
| committer | Victor Toso <me@victortoso.com> | 2018-07-25 23:49:58 +0200 |
| commit | 92e0f2a0fb9565e58f388d2606d6a26fead29e8a (patch) | |
| tree | eaa0ec95e96ed754386d24881cca3c3c80fe6c9c | |
| parent | fa337aa3e7bcd9da327f2f48d5cf79ffafcfec9d (diff) | |
| download | grilo-plugins-92e0f2a0fb9565e58f388d2606d6a26fead29e8a.tar.gz | |
build: require same version for glib components
As Glib2 requirement was 2.44 since e0aecb45fc7eaa5 we can use the
same version for all glib components that are required in
Grilo-Plugins
- gmodule-2.0
- gobject-2.0
- glib-2.0
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | meson.build | 9 |
2 files changed, 12 insertions, 7 deletions
diff --git a/configure.ac b/configure.ac index 774e260..e03c992 100644 --- a/configure.ac +++ b/configure.ac @@ -90,10 +90,12 @@ fi # HARD DEPENDENCIES # ---------------------------------------------------------- -PKG_CHECK_MODULES([DEPS], glib-2.0 >= 2.44 \ - gobject-2.0 \ - gmodule-2.0 \ - ${GRL_NAME} >= 0.3.1) +GLIB2_REQUIRED=2.44 + +PKG_CHECK_MODULES([DEPS], glib-2.0 >= $GLIB2_REQUIRED \ + gobject-2.0 >= $GLIB2_REQUIRED \ + gmodule-2.0 >= $GLIB2_REQUIRED \ + ${GRL_NAME} >= 0.3.1) GLIB_COMPILE_RESOURCES=`$PKG_CONFIG --variable glib_compile_resources gio-2.0` AC_SUBST(GLIB_COMPILE_RESOURCES) diff --git a/meson.build b/meson.build index 7788709..b1ddace 100644 --- a/meson.build +++ b/meson.build @@ -26,9 +26,12 @@ libdir = get_option('libdir') datadir = get_option('datadir') pluginsdir =join_paths(libdir, 'grilo-@0@.@1@'.format(grl_major, grl_minor)) -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) + +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) grilo_dep = dependency('grilo-0.3', version: '>= 0.3.1', required: true) avahi_client_dep = dependency('avahi-client', required: false) |