meson: add numactl 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 9e4f6826ed69dce96301618fd32b653558ed24e3..f9ce2c32ab27586e66644c3b5b34f08e03501156 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,6 @@ fi
 # Check for compiler and library settings.
 
 LIBVIRT_ARG_NSS
-LIBVIRT_ARG_NUMACTL
 LIBVIRT_ARG_OPENWSMAN
 LIBVIRT_ARG_PCIACCESS
 LIBVIRT_ARG_PM_UTILS
@@ -122,7 +121,6 @@ LIBVIRT_ARG_VIRTUALPORT
 LIBVIRT_ARG_WIRESHARK
 LIBVIRT_ARG_YAJL
 
-LIBVIRT_CHECK_NUMACTL
 LIBVIRT_CHECK_NWFILTER
 LIBVIRT_CHECK_OPENWSMAN
 LIBVIRT_CHECK_PCIACCESS
@@ -415,7 +413,6 @@ AC_MSG_NOTICE([Libraries])
 AC_MSG_NOTICE([])
 LIBVIRT_RESULT_LIBXL
 LIBVIRT_RESULT_NSS
-LIBVIRT_RESULT_NUMACTL
 LIBVIRT_RESULT_OPENWSMAN
 LIBVIRT_RESULT_PCIACCESS
 LIBVIRT_RESULT_PM_UTILS

diff --git a/m4/virt-numactl.m4 b/m4/virt-numactl.m4
deleted file mode 100644 (file)
index f93ffd5..0000000
--- a/m4/virt-numactl.m4
+++ /dev/null
@@ -1,34 +0,0 @@
-dnl The libnuma.so library
-dnl
-dnl Copyright (C) 2012-2013 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_ARG_NUMACTL],[
-  LIBVIRT_ARG_WITH_FEATURE([NUMACTL], [numa], [check])
-])
-
-AC_DEFUN([LIBVIRT_CHECK_NUMACTL],[
-  LIBVIRT_CHECK_LIB([NUMACTL], [numa], [numa_available], [numa.h])
-  AC_CHECK_LIB([numa], [numa_bitmask_isbitset], [have_numa_bitmask_isbitset=yes])
-  if test "$have_numa_bitmask_isbitset" = "yes"; then
-    AC_DEFINE_UNQUOTED([HAVE_NUMA_BITMASK_ISBITSET], 1, [whether numa_bitmask_isbitset is available])
-  fi
-])
-
-AC_DEFUN([LIBVIRT_RESULT_NUMACTL],[
-  LIBVIRT_RESULT_LIB([NUMACTL])
-])

diff --git a/meson.build b/meson.build
index ced195d29cab0bdb691889acc2a725dc03a09f8f..464fdaba2f98757f61c7689b5e46401b76832bf5 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1226,6 +1226,15 @@ if not get_option('nls').disabled()
   endif
 endif
 
+numactl_dep = cc.find_library('numa', required: get_option('numactl'))
+if numactl_dep.found()
+  conf.set('WITH_NUMACTL', 1)
+
+  if cc.has_function('numa_bitmask_isbitset', dependencies: [ numactl_dep ])
+    conf.set('HAVE_NUMA_BITMASK_ISBITSET', 1)
+  endif
+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)
@@ -1379,6 +1388,7 @@ libs_summary = {
   'macvtap': conf.has('WITH_MACVTAP'),
   'netcf': netcf_dep.found(),
   'NLS': have_gnu_gettext_tools,
+  'numaclt': numactl_dep.found(),
   'readline': readline_dep.found(),
 }
 summary(libs_summary, section: 'Libraries', bool_yn: true)

diff --git a/meson_options.txt b/meson_options.txt
index 2af4772d94411b74369142a7d189888eaa25ecd2..a77d12daf4e40d597df40bb53d0210eb24e1aa7e 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -31,6 +31,7 @@ option('libssh2', type: 'feature', value: 'auto', description: 'libssh2 support'
 option('macvtap', type: 'feature', value: 'auto', description: 'enable macvtap device')
 option('netcf', type: 'feature', value: 'auto', description: 'netcf support')
 option('nls', type: 'feature', value: 'auto', description: 'nls support')
+option('numactl', type: 'feature', value: 'auto', description: 'numactl support')
 option('readline', type: 'feature', value: 'auto', description: 'readline support')