From 0cf36cae4cd53241ec1caa31e7e6b9ff28c6429d Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Tue, 16 Apr 2019 16:43:45 -0400 Subject: [PATCH] Namespace check_sdt_works custom macro MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The ax_ prefix is for macros that are copied from the Autoconf archive project. Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- configure.ac | 4 ++-- m4/ax_check_sdt_works.m4 | 20 ---------------- m4/lttng_check_sdt_works.m4 | 46 +++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 22 deletions(-) delete mode 100644 m4/ax_check_sdt_works.m4 create mode 100644 m4/lttng_check_sdt_works.m4 diff --git a/configure.ac b/configure.ac index 06e6e10e6..b0f1d1ff3 100644 --- a/configure.ac +++ b/configure.ac @@ -25,8 +25,8 @@ AC_PROG_CXX rw_PROG_CXX_WORKS AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) -ax_CHECK_SDT_WORKS -AM_CONDITIONAL([SDT_WORKS], [test "x$ax_check_sdt_works" = "xyes"]) +LTTNG_CHECK_SDT_WORKS +AM_CONDITIONAL([SDT_WORKS], [test "x$lttng_cv_sdt_works" = "xyes"]) # Checks for programs. AC_PROG_GREP diff --git a/m4/ax_check_sdt_works.m4 b/m4/ax_check_sdt_works.m4 deleted file mode 100644 index 49ee68444..000000000 --- a/m4/ax_check_sdt_works.m4 +++ /dev/null @@ -1,20 +0,0 @@ -# ac_CHECK_SDT_WORKS -# -# Check whether it's possible to build a binary with Systemtap SDT probes. - -AC_DEFUN([ax_CHECK_SDT_WORKS], [ -AC_COMPILE_IFELSE( -[AC_LANG_SOURCE([[ - #define SDT_USE_VARIADIC - #include - void fct(void) - { - STAP_PROBEV(provider,name,1,2,3,4,5,6,7,8,9,10); - } - ]])], [ - ax_check_sdt_works=yes - ], [ - ax_check_sdt_works=no - ] -) -]) diff --git a/m4/lttng_check_sdt_works.m4 b/m4/lttng_check_sdt_works.m4 new file mode 100644 index 000000000..7f2a1ba56 --- /dev/null +++ b/m4/lttng_check_sdt_works.m4 @@ -0,0 +1,46 @@ +# SYNOPSIS +# +# LTTNG_CHECK_SDT_WORKS([ACTION-SUCCESS], [ACTION-FAILURE]) +# +# DESCRIPTION +# +# Check whether it's possible to build a binary with Systemtap SDT probes. +# +# ACTION-SUCCESS/ACTION-FAILURE are shell commands to execute on +# success/failure. +# +# LICENSE +# +# Copyright (c) 2018 Francis Deslauriers +# Copyright (c) 2019 Michael Jeanson +# +# Copying and distribution of this file, with or without modification, are +# permitted in any medium without royalty provided the copyright notice +# and this notice are preserved. This file is offered as-is, without any +# warranty. + +#serial 1 + +AC_DEFUN([LTTNG_CHECK_SDT_WORKS], [ + AC_CACHE_CHECK([whether SDT probes compile], [lttng_cv_sdt_works], [ + AC_COMPILE_IFELSE([ + AC_LANG_SOURCE([[ + #define SDT_USE_VARIADIC + #include + void fct(void) + { + STAP_PROBEV(provider,name,1,2,3,4,5,6,7,8,9,10); + } + ]]) + ], [ + lttng_cv_sdt_works=yes + ], [ + lttng_cv_sdt_works=no + ]) + ]) + AS_IF([test "x$lttng_cv_sdt_works" = "xyes"], [ + m4_default([$1], :) + ], [ + m4_default([$2], :) + ]) +]) -- 2.34.1