External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2024-12-31 10:05:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

meson: add dlopen build dependency

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-04-29 10:34:31 +02:00
parent b12657e472
commit 8b7dbdf19a
3 changed files with 10 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.ac
View File

@ -141,7 +141,6 @@ LIBVIRT_ARG_VIRTUALPORT
LIBVIRT_ARG_WIRESHARK LIBVIRT_ARG_WIRESHARK
LIBVIRT_ARG_YAJL LIBVIRT_ARG_YAJL
LIBVIRT_CHECK_DLOPEN
LIBVIRT_CHECK_FIREWALLD LIBVIRT_CHECK_FIREWALLD
LIBVIRT_CHECK_FIREWALLD_ZONE LIBVIRT_CHECK_FIREWALLD_ZONE
LIBVIRT_CHECK_FUSE LIBVIRT_CHECK_FUSE
@ -458,7 +457,6 @@ LIBVIRT_RESULT_DRIVER_MODULES
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
AC_MSG_NOTICE([Libraries]) AC_MSG_NOTICE([Libraries])
AC_MSG_NOTICE([]) AC_MSG_NOTICE([])
LIBVIRT_RESULT_DLOPEN
LIBVIRT_RESULT_FIREWALLD LIBVIRT_RESULT_FIREWALLD
LIBVIRT_RESULT_FIREWALLD_ZONE LIBVIRT_RESULT_FIREWALLD_ZONE
LIBVIRT_RESULT_FUSE LIBVIRT_RESULT_FUSE

45
m4/virt-dlopen.m4
View File

@ -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])
])

10
meson.build
View File

@ -1040,6 +1040,15 @@ if devmapper_dep.found()
conf.set('WITH_DEVMAPPER', 1) conf.set('WITH_DEVMAPPER', 1)
endif 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 7.0 is the first version which includes pkg-config support
readline_version = '7.0' readline_version = '7.0'
readline_dep = dependency('readline', version: '>=' + readline_version, required: false) readline_dep = dependency('readline', version: '>=' + readline_version, required: false)
@ -1158,6 +1167,7 @@ libs_summary = {
'capng': capng_dep.found(), 'capng': capng_dep.found(),
'curl': curl_dep.found(), 'curl': curl_dep.found(),
'dbus': dbus_dep.found(), 'dbus': dbus_dep.found(),
'dlopen': dlopen_dep.found(),
'readline': readline_dep.found(), 'readline': readline_dep.found(),
} }
summary(libs_summary, section: 'Libraries', bool_yn: true) summary(libs_summary, section: 'Libraries', bool_yn: true)