[libvirt PATCH 078/351] meson: add xdr build dependency

Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com&gt; --- configure.ac | 2 -- m4/virt-xdr.m4 | 40 ---------------------------------------- meson.build | 12 ++++++++++++ 3 files changed, 12 insertions(+), 42 deletions(-) delete mode 100644 m4/virt-xdr.m4 diff --git a/configure.ac b/configure.ac index 5e92466c4aa..1a1a855cba6 100644 --- a/configure.ac +++ b/configure.ac @@ -113,7 +113,6 @@ LIBVIRT_ARG_YAJL LIBVIRT_CHECK_NWFILTER LIBVIRT_CHECK_PM_UTILS -LIBVIRT_CHECK_XDR LIBVIRT_CHECK_YAJL @@ -393,7 +392,6 @@ LIBVIRT_RESULT_LIBXL LIBVIRT_RESULT_NSS LIBVIRT_RESULT_PM_UTILS LIBVIRT_RESULT_RBD -LIBVIRT_RESULT_XDR LIBVIRT_RESULT_YAJL AC_MSG_NOTICE([]) AC_MSG_NOTICE([Windows]) diff --git a/m4/virt-xdr.m4 b/m4/virt-xdr.m4 deleted file mode 100644 index 09d0c2ba2f4..00000000000 --- a/m4/virt-xdr.m4 +++ /dev/null @@ -1,40 +0,0 @@ -dnl The XDR implementation check -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_XDR], [ - if test x"$with_remote" = x"yes" || test x"$with_libvirtd" = x"yes"; then - dnl On MinGW portablexdr provides XDR functions, on linux they are - dnl provided by libtirpc and on FreeBSD/macOS there is no need to - dnl use extra library as it's provided by libc directly. - - with_xdr="yes" - - if test "$with_win" = "yes"; then - LIBVIRT_CHECK_LIB([XDR], [portablexdr], [xdrmem_create], [rpc/rpc.h]) - elif test "$with_linux" = "yes"; then - LIBVIRT_CHECK_PKG([XDR], [libtirpc], [0.1.10]) - else - AM_CONDITIONAL([WITH_XDR], [test "x$with_xdr" = "xyes"]) - fi - fi -]) - -AC_DEFUN([LIBVIRT_RESULT_XDR], [ - LIBVIRT_RESULT_LIB([XDR]) -]) diff --git a/meson.build b/meson.build index b710417db2f..948ca4d93ab 100644 --- a/meson.build +++ b/meson.build @@ -1443,6 +1443,17 @@ if wireshark_dep.found() wireshark_plugindir = wireshark_plugindir / 'epan' endif +# On MinGW portablexdr provides XDR functions, on linux they are +# provided by libtirpc and on FreeBSD/macOS there is no need to +# use extra library as it's provided by libc directly. +if host_machine.system() == 'windows' + xdr_dep = cc.find_library('portablexdr', required: false) +elif host_machine.system() == 'linux' + xdr_dep = dependency('libtirpc', required: false) +else + xdr_dep = declare_dependency() +endif + # generic build dependencies checks @@ -1558,6 +1569,7 @@ libs_summary = { 'selinux': selinux_dep.found(), 'udev': udev_dep.found(), 'virtualport': conf.has('WITH_VIRTUALPORT'), + 'xdr': xdr_dep.found(), } summary(libs_summary, section: 'Libraries', bool_yn: true) -- 2.26.2