[libvirt PATCH 097/351] meson: add node_device driver check

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 9 --------- meson.build | 4 ++++ 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/configure.ac b/configure.ac index 0ab742c970f..e4cd6c15e16 100644 --- a/configure.ac +++ b/configure.ac @@ -223,15 +223,6 @@ LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.} AC_SUBST([LV_LIBTOOL_OBJDIR]) -with_nodedev=no; -if test "$with_hal" = "yes" || test "$with_udev" = "yes"; -then - with_nodedev=yes - AC_DEFINE_UNQUOTED([WITH_NODE_DEVICES], 1, [with node device driver]) -fi -AM_CONDITIONAL([WITH_NODE_DEVICES], [test "$with_nodedev" = "yes"]) - - GNUmakefile=GNUmakefile m4_if(m4_version_compare([2.61a.100], m4_defn([m4_PACKAGE_VERSION])), [1], [], diff --git a/meson.build b/meson.build index 3bd4e0423d2..6527473ceaf 100644 --- a/meson.build +++ b/meson.build @@ -1695,6 +1695,10 @@ if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD') and conf.set('WITH_NETWORK', 1) endif +if hal_dep.found() or udev_dep.found() + conf.set('WITH_NODE_DEVICES', 1) +endif + if not get_option('driver_openvz').disabled() and host_machine.system() == 'linux' conf.set('WITH_OPENVZ', 1) elif get_option('driver_openvz').enabled() -- 2.26.2