meson: add node_device driver check

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 d4aea7bb3addc042404750b52b9073e12ccd0d2e..9de58afddbdbb3dd92ace14d7ee82c03d2918a4c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -221,15 +221,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 8adc9377d285d6a3895191d0351af3960c2e9feb..65103ec6e45262b270015cf4480b4d98a8e9b723 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1713,6 +1713,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()