[libvirt PATCH 073/351] meson: add udev build options

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 configure.ac      |  3 ---
 m4/virt-udev.m4   | 36 ------------------------------------
 meson.build       | 11 +++++++++++
 meson_options.txt |  1 +
 4 files changed, 12 insertions(+), 39 deletions(-)
 delete mode 100644 m4/virt-udev.m4

diff --git a/configure.ac b/configure.ac
index 60cde7c3da7..da4873ea6fd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,14 +109,12 @@ fi
 
 LIBVIRT_ARG_NSS
 LIBVIRT_ARG_PM_UTILS
-LIBVIRT_ARG_UDEV
 LIBVIRT_ARG_VIRTUALPORT
 LIBVIRT_ARG_WIRESHARK
 LIBVIRT_ARG_YAJL
 
 LIBVIRT_CHECK_NWFILTER
 LIBVIRT_CHECK_PM_UTILS
-LIBVIRT_CHECK_UDEV
 LIBVIRT_CHECK_VIRTUALPORT
 LIBVIRT_CHECK_WIRESHARK
 LIBVIRT_CHECK_XDR
@@ -403,7 +401,6 @@ LIBVIRT_RESULT_LIBXL
 LIBVIRT_RESULT_NSS
 LIBVIRT_RESULT_PM_UTILS
 LIBVIRT_RESULT_RBD
-LIBVIRT_RESULT_UDEV
 LIBVIRT_RESULT_VIRTUALPORT
 LIBVIRT_RESULT_XDR
 LIBVIRT_RESULT_YAJL
diff --git a/m4/virt-udev.m4 b/m4/virt-udev.m4
deleted file mode 100644
index 2e0f993e339..00000000000
--- a/m4/virt-udev.m4
+++ /dev/null
@@ -1,36 +0,0 @@
-dnl The libudev.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_UDEV],[
-  LIBVIRT_ARG_WITH_FEATURE([UDEV], [libudev], [check], [219])
-])
-
-AC_DEFUN([LIBVIRT_CHECK_UDEV],[
-  AC_REQUIRE([LIBVIRT_CHECK_PCIACCESS])
-  LIBVIRT_CHECK_PKG([UDEV], [libudev], [219])
-
-  if test "$with_udev" = "yes" && test "$with_pciaccess" != "yes" ; then
-    AC_MSG_ERROR([You must install the pciaccess module to build with udev])
-  fi
-])
-
-AC_DEFUN([LIBVIRT_RESULT_UDEV],[
-  AC_REQUIRE([LIBVIRT_RESULT_PCIACCESS])
-  LIBVIRT_RESULT_LIB([UDEV])
-])
diff --git a/meson.build b/meson.build
index 41c6075985d..453522fd79a 100644
--- a/meson.build
+++ b/meson.build
@@ -1364,6 +1364,12 @@ if not cc.compiles(pthread_sigmask_code)
   conf.set('FUNC_PTHREAD_SIGMASK_BROKEN', 1)
 endif
 
+udev_version = '219'
+udev_dep = dependency('libudev', version: '>=' + udev_version, required: get_option('udev'))
+if udev_dep.found()
+  conf.set('WITH_UDEV', 1)
+endif
+
 
 # generic build dependencies checks
 
@@ -1414,6 +1420,10 @@ elif get_option('polkit').enabled()
   error('You must install dbus to compile libvirt with polkit-1')
 endif
 
+if udev_dep.found() and not pciaccess_dep.found()
+  error('You must install the pciaccess module to build with udev')
+endif
+
 
 # define top include directory
 
@@ -1469,6 +1479,7 @@ libs_summary = {
   'sanlock': conf.has('WITH_SANLOCK'),
   'sasl': sasl_dep.found(),
   'selinux': selinux_dep.found(),
+  'udev': udev_dep.found(),
 }
 summary(libs_summary, section: 'Libraries', bool_yn: true)
 
diff --git a/meson_options.txt b/meson_options.txt
index 40830f9494a..42b63444ee4 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -39,3 +39,4 @@ option('sanlock', type: 'feature', value: 'auto', description: 'sanlock support'
 option('sasl', type: 'feature', value: 'auto', description: 'sasl supprt')
 option('selinux', type: 'feature', value: 'auto', description: 'selinux support')
 option('selinux_mount', type: 'string', value: '', description: 'set SELinux mount point')
+option('udev', type: 'feature', value: 'auto', description: 'udev support')
-- 
2.26.2