meson: add hal build dependency

Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>

diff --git a/configure.ac b/configure.ac
index 8c0f39b96a86f80712cd3c3f87897ac7380ab17e..c03e840e645ff2d5b076e11c12c705f1ccc72286 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,6 @@ fi
 
 # Check for compiler and library settings.
 
-LIBVIRT_ARG_HAL
 LIBVIRT_ARG_LIBISCSI
 LIBVIRT_ARG_LIBPCAP
 LIBVIRT_ARG_LIBSSH
@@ -133,7 +132,6 @@ LIBVIRT_ARG_VIRTUALPORT
 LIBVIRT_ARG_WIRESHARK
 LIBVIRT_ARG_YAJL
 
-LIBVIRT_CHECK_HAL
 LIBVIRT_CHECK_LIBISCSI
 LIBVIRT_CHECK_LIBNL
 LIBVIRT_CHECK_LIBPARTED
@@ -443,7 +441,6 @@ LIBVIRT_RESULT_DRIVER_MODULES
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Libraries])
 AC_MSG_NOTICE([])
-LIBVIRT_RESULT_HAL
 LIBVIRT_RESULT_LIBISCSI
 LIBVIRT_RESULT_LIBNL
 LIBVIRT_RESULT_LIBPCAP

diff --git a/m4/virt-hal.m4 b/m4/virt-hal.m4
deleted file mode 100644 (file)
index e37bbf9..0000000
--- a/m4/virt-hal.m4
+++ /dev/null
@@ -1,30 +0,0 @@
-dnl The libhal.so library
-dnl
-dnl Copyright (C) 2012-2013 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_HAL],[
-  LIBVIRT_ARG_WITH_FEATURE([HAL], [hal], [check], [0.5.0])
-])
-
-AC_DEFUN([LIBVIRT_CHECK_HAL],[
-  LIBVIRT_CHECK_PKG([HAL], [hal], [0.5.0])
-])
-
-AC_DEFUN([LIBVIRT_RESULT_HAL],[
-  LIBVIRT_RESULT_LIB([HAL])
-])

diff --git a/meson.build b/meson.build
index cdabeb59dbece6f5357b56975d24ca3726a43ba2..40c6f38f5ca16f1346d7a7418d6475f0553f155e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1069,6 +1069,12 @@ glusterfs_dep = dependency('glusterfs-api', version: '>=' + glusterfs_version, r
 gnutls_version = '3.2.0'
 gnutls_dep = dependency('gnutls', version: '>=' + gnutls_version)
 
+hal_version = '0.5.0'
+hal_dep = dependency('hal', version: '>=' + hal_version, required: get_option('hal'))
+if hal_dep.found()
+  conf.set('WITH_HAL', 1)
+endif
+
 # 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)
@@ -1208,6 +1214,7 @@ libs_summary = {
   'glib_dep': glib_dep.found(),
   'glusterfs': glusterfs_dep.found(),
   'gnutls': gnutls_dep.found(),
+  'hal': hal_dep.found(),
   'readline': readline_dep.found(),
 }
 summary(libs_summary, section: 'Libraries', bool_yn: true)

diff --git a/meson_options.txt b/meson_options.txt
index d894f972c30b5592a1a8d804118be76dce16a6fc..ff8f81645e49257b9198d7dfb602f457153e044e 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -23,6 +23,7 @@ option('firewalld', type: 'feature', value: 'auto', description: 'firewalld supp
 option('firewalld_zone', type: 'feature', value: 'auto', description: 'whether to install firewalld libvirt zone')
 option('fuse', type: 'feature', value: 'auto', description: 'fuse support')
 option('glusterfs', type: 'feature', value: 'auto', description: 'glusterfs support')
+option('hal', type: 'feature', value: 'auto', description: 'hal support')
 option('readline', type: 'feature', value: 'auto', description: 'readline support')