Signed-off-by: Pavel Hrdina <phrdina@xxxxxxxxxx> --- configure.ac | 2 -- m4/virt-glib.m4 | 36 ------------------------------------ meson.build | 9 +++++++++ 3 files changed, 9 insertions(+), 38 deletions(-) delete mode 100644 m4/virt-glib.m4 diff --git a/configure.ac b/configure.ac index b136bf6a4cd..0a8a0221206 100644 --- a/configure.ac +++ b/configure.ac @@ -134,7 +134,6 @@ LIBVIRT_ARG_VIRTUALPORT LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_YAJL -LIBVIRT_CHECK_GLIB LIBVIRT_CHECK_GLUSTER LIBVIRT_CHECK_GNUTLS LIBVIRT_CHECK_HAL @@ -449,7 +448,6 @@ LIBVIRT_RESULT_DRIVER_MODULES AC_MSG_NOTICE([]) AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([]) -LIBVIRT_RESULT_GLIB LIBVIRT_RESULT_GLUSTER LIBVIRT_RESULT_GNUTLS LIBVIRT_RESULT_HAL diff --git a/m4/virt-glib.m4 b/m4/virt-glib.m4 deleted file mode 100644 index 03e51711c0c..00000000000 --- a/m4/virt-glib.m4 +++ /dev/null @@ -1,36 +0,0 @@ -dnl The glib.so library -dnl -dnl Copyright (C) 2016 Red Hat, Inc. -dnl -dnl This library is free software; you can redistribute it and/or -dnl modify it under the terms of the GNU Lesser General Public -dnl License as published by the Free Software Foundation; either -dnl version 2.1 of the License, or (at your option) any later version. -dnl -dnl This library is distributed in the hope that it will be useful, -dnl but WITHOUT ANY WARRANTY; without even the implied warranty of -dnl MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -dnl Lesser General Public License for more details. -dnl -dnl You should have received a copy of the GNU Lesser General Public -dnl License along with this library. If not, see -dnl <http://www.gnu.org/licenses/>. -dnl - -AC_DEFUN([LIBVIRT_ARG_GLIB], [ - LIBVIRT_ARG_WITH([GLIB], [glib-2.0 location], [check]) -]) - -AC_DEFUN([LIBVIRT_CHECK_GLIB],[ - GLIB_REQUIRED=2.48.0 - - LIBVIRT_CHECK_PKG([GLIB], [glib-2.0 gobject-2.0 gio-2.0], [$GLIB_REQUIRED]) - - if test "$with_glib" = "no" ; then - AC_MSG_ERROR([glib-2.0, gobject-2.0 >= $GLIB_REQUIRED are required for libvirt]) - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_GLIB], [ - LIBVIRT_RESULT_LIB([GLIB]) -]) diff --git a/meson.build b/meson.build index 7ed5a0218f9..132d887be2a 100644 --- a/meson.build +++ b/meson.build @@ -1039,6 +1039,14 @@ if fuse_dep.found() conf.set('WITH_FUSE', 1) endif +glib_version = '2.48.0' +glib_dep = dependency('glib-2.0', version: '>=' + glib_version) +gobject_dep = dependency('gobject-2.0', version: '>=' + glib_version) +gio_dep = dependency('gio-2.0', version: '>=' + glib_version) +glib_dep = declare_dependency( + dependencies: [ glib_dep, gobject_dep, gio_dep ], +) + # readline 7.0 is the first version which includes pkg-config support readline_version = '7.0' readline_dep = dependency('readline', version: '>=' + readline_version, required: false) @@ -1175,6 +1183,7 @@ libs_summary = { 'firewalld': conf.has('WITH_FIREWALLD'), 'firewalld-zone': conf.has('WITH_FIREWALLD_ZONE'), 'fuse': fuse_dep.found(), + 'glib_dep': glib_dep.found(), 'readline': readline_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) -- 2.26.2
