4:55 a.m.
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 7 -------
m4/virt-dtrace.m4 | 45 ---------------------------------------------
meson.build | 8 ++++++++
meson_options.txt | 1 +
4 files changed, 9 insertions(+), 52 deletions(-)
delete mode 100644 m4/virt-dtrace.m4
diff --git a/configure.ac b/configure.ac
index d97bc702299..2f486df2e23 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,10 +73,6 @@ case $host in
*-*-mingw* | *-*-msvc* ) with_win=yes ;;
esac
-if test $with_linux = no; then
- with_dtrace=no
-fi
-
AM_CONDITIONAL([WITH_LINUX], [test "$with_linux" = "yes"])
AM_CONDITIONAL([WITH_FREEBSD], [test "$with_freebsd" = "yes"])
AM_CONDITIONAL([WITH_MACOS], [test "$with_macos" = "yes"])
@@ -101,7 +97,6 @@ dnl
dnl Miscellaneous checks
dnl
-LIBVIRT_ARG_DTRACE
LIBVIRT_ARG_NUMAD
LIBVIRT_ARG_INIT_SCRIPT
LIBVIRT_ARG_LOGIN_SHELL
@@ -110,7 +105,6 @@ LIBVIRT_ARG_TLS_PRIORITY
LIBVIRT_ARG_SYSCTL_CONFIG
-LIBVIRT_CHECK_DTRACE
LIBVIRT_CHECK_NUMAD
LIBVIRT_CHECK_INIT_SCRIPT
LIBVIRT_CHECK_LOGIN_SHELL
@@ -185,7 +179,6 @@ LIBVIRT_WIN_RESULT_WINDRES
AC_MSG_NOTICE([])
AC_MSG_NOTICE([Miscellaneous])
AC_MSG_NOTICE([])
-LIBVIRT_RESULT_DTRACE
LIBVIRT_RESULT_NUMAD
LIBVIRT_RESULT_INIT_SCRIPT
LIBVIRT_RESULT_LOGIN_SHELL
diff --git a/m4/virt-dtrace.m4 b/m4/virt-dtrace.m4
deleted file mode 100644
index 3dc20d53436..00000000000
--- a/m4/virt-dtrace.m4
+++ /dev/null
@@ -1,45 +0,0 @@
-dnl The DTrace static probes
-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_ARG_DTRACE], [
- LIBVIRT_ARG_WITH([DTRACE], [use dtrace for static probing], [check])
-])
-
-AC_DEFUN([LIBVIRT_CHECK_DTRACE], [
- if test "$with_dtrace" != "no" ; then
- AC_PATH_PROG([DTRACE], [dtrace], [], [$LIBVIRT_SBIN_PATH])
- if test -z "$DTRACE" ; then
- if test "$with_dtrace" = "check"; then
- with_dtrace=no
- else
- AC_MSG_ERROR([You must install the 'dtrace' binary to enable libvirt
static probes])
- fi
- else
- with_dtrace=yes
- fi
- if test "$with_dtrace" = "yes"; then
- AC_DEFINE_UNQUOTED([WITH_DTRACE_PROBES], 1, [whether DTrace static probes are
available])
- fi
- fi
- AM_CONDITIONAL([WITH_DTRACE_PROBES], [test "$with_dtrace" !=
"no"])
-])
-
-AC_DEFUN([LIBVIRT_RESULT_DTRACE], [
- LIBVIRT_RESULT([DTrace], [$with_dtrace])
-])
diff --git a/meson.build b/meson.build
index 681874fd447..c7c5cdd3b40 100644
--- a/meson.build
+++ b/meson.build
@@ -2073,6 +2073,13 @@ if conf.has('WITH_LIBVIRTD')
driver_modules_flags = libvirt_export_dynamic
endif
+if host_machine.system() == 'linux'
+ dtrace_prog = find_program('dtrace', required: get_option('dtrace'),
dirs: libvirt_sbin_path)
+ if dtrace_prog.found()
+ conf.set('WITH_DTRACE_PROBES', 1)
+ endif
+endif
+
# define top include directory
@@ -2197,6 +2204,7 @@ misc_summary = {
'Debug': conf.has('ENABLE_DEBUG'),
'Use -Werror': cc_flags.contains('-Werror'),
'Warning Flags': supported_cc_flags,
+ 'DTrace': conf.has('WITH_DTRACE_PROBES'),
'Char device locks': chrdev_lock_files,
'Default Editor': conf.get_unquoted('DEFAULT_EDITOR'),
}
diff --git a/meson_options.txt b/meson_options.txt
index 476ed12a933..b12d0aa3d7b 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -93,3 +93,4 @@ option('storage_zfs', type: 'feature', value:
'auto', description: 'ZFS backend
option('chrdev_lock_files', type: 'string', value: '',
description: 'location for UUCP style lock files for character devices (leave empty
for default paths on some platforms)')
option('debug_logs', type: 'boolean', value: true, description:
'enable debugging output')
option('default_editor', type: 'string', value: 'vi',
description: 'Editor to use for interactive commands')
+option('dtrace', type: 'feature', value: 'auto', description:
'use dtrace for static probing')
--
2.26.2