External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-22 21:55:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add node_device driver check

Browse Source 
Signed-off-by: Pavel Hrdina <phrdina@redhat.com>
Reviewed-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Neal Gompa <ngompa13@gmail.com>
This commit is contained in:
Pavel Hrdina 2020-06-30 19:53:59 +02:00
parent 1f93990dc7
commit 57225bb988
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
configure.ac
View File

@ -221,15 +221,6 @@ LV_LIBTOOL_OBJDIR=${lt_cv_objdir-.}
AC_SUBST([LV_LIBTOOL_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 GNUmakefile=GNUmakefile
m4_if(m4_version_compare([2.61a.100], m4_if(m4_version_compare([2.61a.100],
m4_defn([m4_PACKAGE_VERSION])), [1], [], m4_defn([m4_PACKAGE_VERSION])), [1], [],

4
meson.build
View File

@ -1713,6 +1713,10 @@ if not get_option('driver_network').disabled() and conf.has('WITH_LIBVIRTD') and
conf.set('WITH_NETWORK', 1) conf.set('WITH_NETWORK', 1)
endif 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' if not get_option('driver_openvz').disabled() and host_machine.system() == 'linux'
conf.set('WITH_OPENVZ', 1) conf.set('WITH_OPENVZ', 1)
elif get_option('driver_openvz').enabled() elif get_option('driver_openvz').enabled()