meson: add dlopen build dependency

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 59a047413abea76c8a2bc1c61bed3cf4140a98a9..3990a836c20550951df96099df2f9abf52cff8de 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -141,7 +141,6 @@ LIBVIRT_ARG_VIRTUALPORT
 LIBVIRT_ARG_WIRESHARK
 LIBVIRT_ARG_YAJL
 
-LIBVIRT_CHECK_DLOPEN
 LIBVIRT_CHECK_FIREWALLD
 LIBVIRT_CHECK_FIREWALLD_ZONE
 LIBVIRT_CHECK_FUSE
@@ -458,7 +457,6 @@ LIBVIRT_RESULT_DRIVER_MODULES
 AC_MSG_NOTICE([])
 AC_MSG_NOTICE([Libraries])
 AC_MSG_NOTICE([])
-LIBVIRT_RESULT_DLOPEN
 LIBVIRT_RESULT_FIREWALLD
 LIBVIRT_RESULT_FIREWALLD_ZONE
 LIBVIRT_RESULT_FUSE

diff --git a/m4/virt-dlopen.m4 b/m4/virt-dlopen.m4
deleted file mode 100644 (file)
index 412ce79..0000000
--- a/m4/virt-dlopen.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-dnl The dlopen library
-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_DLOPEN], [
-
-  with_dlopen=yes
-  with_dlfcn=yes
-
-  AC_CHECK_HEADER([dlfcn.h],, [with_dlfcn=no])
-  AC_SEARCH_LIBS([dlopen], [dl],, [with_dlopen=no])
-
-  case $ac_cv_search_dlopen:$host_os in
-    'none required'* | *:mingw* | *:msvc*)
-      DLOPEN_LIBS= ;;
-    no*)
-      AC_MSG_ERROR([Unable to find dlopen()]) ;;
-    *)
-      if test "x$with_dlfcn" != "xyes"; then
-        AC_MSG_ERROR([Unable to find dlfcn.h])
-      fi
-      DLOPEN_LIBS=$ac_cv_search_dlopen ;;
-  esac
-
-  AC_SUBST([DLOPEN_LIBS])
-])
-
-AC_DEFUN([LIBVIRT_RESULT_DLOPEN], [
-  LIBVIRT_RESULT_LIB([DLOPEN])
-])

diff --git a/meson.build b/meson.build
index 26cb2c69c5d2f9de9e56950a0883727ed68f18ee..40c6a64d62dadc046cf2b5f3c55b9c06d688ae6e 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1040,6 +1040,15 @@ if devmapper_dep.found()
   conf.set('WITH_DEVMAPPER', 1)
 endif
 
+dlopen_use = host_machine.system() != 'windows'
+dlopen_dep = cc.find_library('dl', required: dlopen_use)
+if dlopen_dep.found()
+  if not cc.has_header('dlfcn.h')
+    error('Unable to find dlfcn.h')
+  endif
+  conf.set('HAVE_DLFCN_H', 1)
+endif
+
 # readline 7.0 is the first version which includes pkg-config support
 readline_version = '7.0'
 readline_dep = dependency('readline', version: '>=' + readline_version, required: false)
@@ -1158,6 +1167,7 @@ libs_summary = {
   'capng': capng_dep.found(),
   'curl': curl_dep.found(),
   'dbus': dbus_dep.found(),
+  'dlopen': dlopen_dep.found(),
   'readline': readline_dep.found(),
 }
 summary(libs_summary, section: 'Libraries', bool_yn: true)