[libvirt] [PATCH 42/89] configure: move DTrace check to its own file
Signed-off-by: Pavel Hrdina <phrdina(a)redhat.com>
---
configure.ac | 23 +++--------------------
m4/virt-dtrace.m4 | 45 +++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 48 insertions(+), 20 deletions(-)
create mode 100644 m4/virt-dtrace.m4
diff --git a/configure.ac b/configure.ac
index 85a8df1fe5..4d35ea4cf8 100644
--- a/configure.ac
+++ b/configure.ac
@@ -959,25 +959,8 @@ if test "$with_apparmor" = "no"; then
fi
AM_CONDITIONAL([WITH_APPARMOR_PROFILES], [test "$with_apparmor_profiles" !=
"no"])
-dnl DTrace static probes
-LIBVIRT_ARG_WITH_ALT([DTRACE], [use dtrace for static probing], [check])
-
-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"])
+LIBVIRT_ARG_DTRACE
+LIBVIRT_CHECK_DTRACE
dnl numad
@@ -1932,7 +1915,7 @@ AC_MSG_NOTICE([])
AC_MSG_NOTICE([ Debug: $enable_debug])
AC_MSG_NOTICE([ Use -Werror: $enable_werror])
AC_MSG_NOTICE([ Warning Flags: $WARN_CFLAGS])
-AC_MSG_NOTICE([ DTrace: $with_dtrace])
+LIBVIRT_RESULT_DTRACE
AC_MSG_NOTICE([ numad: $with_numad])
AC_MSG_NOTICE([ XML Catalog: $with_xml_catalog_file])
LIBVIRT_RESULT_INIT_SCRIPT
diff --git a/m4/virt-dtrace.m4 b/m4/virt-dtrace.m4
new file mode 100644
index 0000000000..6dee416149
--- /dev/null
+++ b/m4/virt-dtrace.m4
@@ -0,0 +1,45 @@
+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_ALT([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], [
+ AC_MSG_NOTICE([ DTrace: $with_dtrace])
+])
--
2.11.0