[libvirt PATCH 115/351] meson: add driver_modules build check

[Pavel Hrdina]

Signed-off-by: Pavel Hrdina <phrdina at redhat.com>
---
 configure.ac              |  8 --------
 m4/virt-driver-modules.m4 | 38 --------------------------------------
 meson.build               | 13 +++++++++++++
 3 files changed, 13 insertions(+), 46 deletions(-)
 delete mode 100644 m4/virt-driver-modules.m4

diff --git a/configure.ac b/configure.ac
index 61e830a97eb..d97bc702299 100644
--- a/configure.ac
+++ b/configure.ac
@@ -136,10 +136,6 @@ LIBVIRT_WIN_CHECK_SYMBOLS
 LIBVIRT_WIN_CHECK_WINDRES
 
 
-dnl Driver-Modules library support
-LIBVIRT_CHECK_DRIVER_MODULES
-
-
 # Set LV_LIBTOOL_OBJDIR to "." or $lt_cv_objdir, depending on whether
 # we're building shared libraries.  This is the name of the directory
 # in which .o files will be created.
@@ -178,10 +174,6 @@ AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Configuration summary])
 AC_MSG_NOTICE([=====================])
 AC_MSG_NOTICE([])
-AC_MSG_NOTICE([Driver Loadable Modules])
-AC_MSG_NOTICE([])
-LIBVIRT_RESULT_DRIVER_MODULES
-AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Libraries])
 AC_MSG_NOTICE([])
 LIBVIRT_RESULT_NSS
diff --git a/m4/virt-driver-modules.m4 b/m4/virt-driver-modules.m4
deleted file mode 100644
index f7902283884..00000000000
--- a/m4/virt-driver-modules.m4
+++ /dev/null
@@ -1,38 +0,0 @@
-dnl The driver module support
-dnl
-dnl Copyright (C) 2016 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_CHECK_DRIVER_MODULES], [
-  AC_REQUIRE([LIBVIRT_CHECK_DLOPEN])
-
-  with_driver_modules=$with_libvirtd
-
-  DRIVER_MODULES_CFLAGS=
-  if test "$with_driver_modules" = "yes"; then
-    if test "$with_dlfcn" != "yes" || test "$with_dlopen" != "yes"; then
-      AC_MSG_ERROR([You must have dlfcn.h / dlopen() support to build driver modules])
-    fi
-
-    DRIVER_MODULES_LDFLAGS="-export-dynamic"
-  fi
-  AC_SUBST([DRIVER_MODULES_LDFLAGS])
-])
-
-AC_DEFUN([LIBVIRT_RESULT_DRIVER_MODULES], [
-  LIBVIRT_RESULT_LIB([DRIVER_MODULES])
-])
diff --git a/meson.build b/meson.build
index d48912eedc9..681874fd447 100644
--- a/meson.build
+++ b/meson.build
@@ -2065,6 +2065,14 @@ endif
 
 conf.set_quoted('DEFAULT_EDITOR', get_option('default_editor'))
 
+driver_modules_flags = []
+if conf.has('WITH_LIBVIRTD')
+  if not conf.has('HAVE_DLFCN_H') or not dlopen_dep.found()
+    error('You must have dlfcn.h / dlopen() support to build driver modules')
+  endif
+  driver_modules_flags = libvirt_export_dynamic
+endif
+
 
 # define top include directory
 
@@ -2127,6 +2135,11 @@ secdriver_summary = {
 }
 summary(secdriver_summary, section: 'Security Drivers', bool_yn: true)
 
+drivermod_summary = {
+  'driver_modules': driver_modules_flags.length() > 0,
+}
+summary(drivermod_summary, section: 'Driver Loadable Modules', bool_yn: true)
+
 libs_summary = {
   'acl': acl_dep.found(),
   'apparmor': apparmor_dep.found(),
-- 
2.26.2