From 5744bf89f560d9b84515ccb2d12aef42877b4b1d Mon Sep 17 00:00:00 2001 From: Michael Jeanson Date: Thu, 11 May 2017 14:30:09 -0400 Subject: [PATCH] Cleanup: lttng-ust library detection MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Simplify lttng-ust detection code. Also remove the --with-lttng-ust-prefix configure option since we don't offer it for other libs and it's based on user variables which the build system shouldn't be messing with. Signed-off-by: Michael Jeanson Signed-off-by: Jérémie Galarneau --- configure.ac | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/configure.ac b/configure.ac index 0791682e6..549d91a58 100644 --- a/configure.ac +++ b/configure.ac @@ -439,31 +439,31 @@ AS_IF([test "x$with_kmod" != "xno"], ) AC_SUBST(KMOD_LIBS) -AC_ARG_WITH(lttng-ust-prefix, - AS_HELP_STRING([--with-lttng-ust-prefix=PATH], - [Specify the installation prefix of the lttng-ust library. - Headers must be in PATH/include; libraries in PATH/lib.]), - [ - AM_CPPFLAGS="$AM_CPPFLAGS -I${withval}/include" - LDFLAGS="$LDFLAGS -L${withval}/lib64 -L${withval}/lib" - ]) +# Check for liblttng-ust-ctl, fail if it's not found, +# it can be explicitly disabled with --without-lttng-ust +AH_TEMPLATE([HAVE_LIBLTTNG_UST_CTL], [Define if you have LTTng-UST control support]) +AC_ARG_WITH([lttng-ust], + [AS_HELP_STRING([--without-lttng-ust], [build without LTTng-UST (Userspace Tracing) support])], + [], + [with_lttng_ust=yes] +) + +AS_IF([test "x$with_lttng_ust" = "xyes"], + [ + AC_CHECK_LIB([lttng-ust-ctl], [ustctl_recv_channel_from_consumer], + [ + AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1]) + ], + [ + AC_MSG_FAILURE([Cannot find LTTng-UST >= 2.2.x. Use [LDFLAGS]=-Ldir and [CPPFLAGS]=-Idir to specify its location, or specify --without-lttng-ust to build lttng-tools without LTTng-UST support.]) + ], + [-lurcu-common -lurcu-bp -lurcu-cds -lrt -ldl] + ) + ] +) +AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$with_lttng_ust" = "xyes"]) + -# Check liblttng-ust-ctl library -AC_ARG_WITH(lttng-ust, - AS_HELP_STRING([--without-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]), - lttng_ust_support=$withval, lttng_ust_support=yes) - -AS_IF([test "x$lttng_ust_support" = "xyes"], [ - AC_CHECK_LIB([lttng-ust-ctl], [ustctl_recv_channel_from_consumer], - [ - AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1], [has LTTng-UST control support]) - lttng_ust_ctl_found=yes - ], - [AC_MSG_ERROR([Cannot find LTTng-UST >= 2.2.x. Use --with-lttng-ust-prefix=PREFIX to specify its location, or specify --without-lttng-ust to build lttng-tools without LTTng-UST support.])], - [-lurcu-common -lurcu-bp -lurcu-cds -lrt -ldl] - ) -]) -AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes]) AC_CHECK_FUNCS([sched_getcpu sysconf sync_file_range]) # check for dlopen @@ -866,7 +866,7 @@ AS_IF([test x$build_lib_consumer = xyes], build_lib_hashtable=yes build_lib_compat=yes build_lib_relayd=yes - AS_IF([test x$lttng_ust_ctl_found = xyes],[build_lib_ust_consumer=yes]) + AS_IF([test "x$with_lttng_ust" = "xyes"], [build_lib_ust_consumer=yes]) ] ) @@ -1132,7 +1132,7 @@ test "x$with_kmod" != "xno" && value=1 || value=0 PPRINT_PROP_BOOL([libkmod support], $value) # LTTng-UST enabled/disabled -test "x$lttng_ust_support" = "xyes" && value=1 || value=0 +test "x$with_lttng_ust" = "xyes" && value=1 || value=0 PPRINT_PROP_BOOL([LTTng-UST support], $value) AS_ECHO -- 2.34.1