X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=6a079bca3ff8979fcc04e81e3079aed789696fe5;hp=df5f54a5eb958bf7c3e1ba1da8f114aade6c8253;hb=3e40ee67e45d41f30a3cb3e9c6cacb4f14bebc75;hpb=ebd4b25de896aad9b3066942ec510c0748a0939d diff --git a/configure.ac b/configure.ac index df5f54a5e..6a079bca3 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.64]) -AC_INIT([lttng-tools],[2.8.0-pre],[jeremie.galarneau@efficios.com],[],[https://lttng.org]) +AC_INIT([lttng-tools],[2.9.0-pre],[jeremie.galarneau@efficios.com],[],[https://lttng.org]) AC_CONFIG_HEADERS([include/config.h]) AC_CONFIG_AUX_DIR([config]) @@ -26,8 +26,16 @@ AC_PROG_LEX AC_PROG_MAKE_SET AC_PROG_SED AC_PROG_YACC +AC_PATH_PROG(report_fold, fold) LT_INIT +# Check for objcopy, required by the base address statedump and dynamic linker tests +AC_CHECK_TOOL([OBJCOPY], objcopy, no) +AS_IF([test "x$OBJCOPY" = xno], + [AC_MSG_WARN([Cannont find objcopy. The base address statedump and dynamic linker tests will be disabled. Install the binutils package to remediate this.])] +) +AM_CONDITIONAL([HAVE_OBJCOPY], [test "x$OBJCOPY" != xno]) + # Checks for typedefs, structures, and compiler characteristics. AC_C_INLINE AC_TYPE_INT32_T @@ -59,6 +67,7 @@ AX_LIB_SOCKET_NSL major_version=$(echo AC_PACKAGE_VERSION | $SED 's/^\([[0-9]]\)*\.[[0-9]]*\.[[0-9]]*.*$/\1/') minor_version=$(echo AC_PACKAGE_VERSION | $SED 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*.*$/\1/') patchlevel_version=$(echo AC_PACKAGE_VERSION | $SED 's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\).*$/\1/') + AC_SUBST([MAJOR_VERSION], [$major_version]) AC_SUBST([MINOR_VERSION], [$minor_version]) AC_SUBST([PATCHLEVEL_VERSION], [$patchlevel_version]) @@ -66,8 +75,8 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [LTTng-Tools major version n AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [LTTng-Tools minor version number]) AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [LTTng-Tools patchlevel version number]) -version_name="Herbe à Détourne" -version_description='Brewed with unrestrained amounts of Citra hop, the Herbe à Détourne is a fantastic New World Tripel brewed by "Dieu du Ciel!". Aromas of mango, cantaloupe melon and passion fruit, combined with a controlled bitter finish, unite in making this smooth golden-orange beer stand apart.' +version_name="Codename TBD" +version_description='Description TBD' version_description_c=$(echo $version_description | $SED 's/"/\\"/g') AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "") @@ -90,7 +99,7 @@ AS_IF([test "x$libtool_fixup" = "xyes"], [ AC_MSG_RESULT([$libtool_flag_pattern_count]) AC_MSG_WARN([the detected libtool will not link all dependencies, forcing link_all_deplibs = unknown]) - SED -i "s/\($libtool_flag_pattern\)\s*=\s*no/\1=unknown/g" $libtool_m4 + $SED -i "s/\($libtool_flag_pattern\)\s*=\s*no/\1=unknown/g" $libtool_m4 ], [ AC_MSG_RESULT([none]) @@ -113,7 +122,7 @@ AC_CHECK_FUNCS([ \ gethostbyname gethostname getpagesize localtime_r memchr memset \ mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \ strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul \ - strtoull dirfd gethostbyname2 getipnodebyname \ + strtoull dirfd gethostbyname2 getipnodebyname epoll_create1 \ ]) # Babeltrace viewer check @@ -214,34 +223,58 @@ AC_DEFINE_DIR([CONFIG_LTTNG_SYSTEM_DATADIR],[datadir], [LTTng system data direct # # Check for pthread AC_CHECK_LIB([pthread], [pthread_create], [], - [AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])] + [AC_MSG_ERROR([Cannot find libpthread. Use LDFLAGS=-Ldir to specify its location.])] ) # Check libpopt -AC_CHECK_LIB([popt], [poptGetContext], [], - [AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])] +PKG_CHECK_MODULES([POPT], [popt], + [LIBS="$LIBS $POPT_LIBS"], + [ + AC_MSG_WARN([pkg-config was unable to find a valid .pc for libpopt. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location]) + AC_MSG_WARN([Finding libpopt without pkg-config.]) + AC_CHECK_LIB([popt], + [poptGetContext], + [], + [ + AC_MSG_ERROR([Cannot find libpopt. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location]) + ] + ) + ] ) AM_PATH_XML2(2.7.6, true, AC_MSG_ERROR(No supported version of libxml2 found.)) # Check for libuuid -AC_CHECK_LIB([uuid], [uuid_generate], +PKG_CHECK_MODULES([UUID], [uuid], [ + LIBS="$LIBS $UUID_LIBS" AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.]) have_libuuid=yes ], [ - # libuuid not found, check for uuid_create in libc. - AC_CHECK_LIB([c], [uuid_create], - [ - AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) - have_libc_uuid=yes - ], - [ - AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) - ]) -] -) + AC_MSG_WARN([pkg-config was unable to find a valid .pc for libuuid. Set PKG_CONFIG_PATH to specify the pkgconfig configuration file location]) + AC_MSG_WARN([Finding libuuid without pkg-config.]) + AC_CHECK_LIB([uuid], + [uuid_generate], + [ + AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.]) + have_libuuid=yes + ], + [ + # libuuid not found, check for uuid_create in libc. + AC_CHECK_LIB([c], + [uuid_create], + [ + AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) + have_libc_uuid=yes + ], + [ + AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Either set PKG_CONFIG_PATH to the configuration file location or use LDFLAGS=-Ldir to specify the library location]) + ] + ) + ] + ) +]) AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"]) AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"]) @@ -311,9 +344,9 @@ AC_ARG_WITH(lttng-ust-prefix, ]) # Check liblttng-ust-ctl library -AC_ARG_ENABLE(lttng-ust, - AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]), - lttng_ust_support=$enableval, lttng_ust_support=yes) +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], @@ -321,7 +354,7 @@ AS_IF([test "x$lttng_ust_support" = "xyes"], [ 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 --disable-lttng-ust to build lttng-tools without LTTng-UST support.])], + [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] ) ]) @@ -382,6 +415,7 @@ AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes]) if test "x${enable_python_binding:-yes}" = xyes; then AX_PKG_SWIG($swig_version, [], [ AC_MSG_ERROR([SWIG $swig_version or newer is needed]) ]) + AS_IF([test x$enable_shared = xno], [ AC_MSG_ERROR([Python bindings require shared libraries.]) ]) AM_PATH_PYTHON([3.0]) AC_ARG_VAR([PYTHON_INCLUDE], [Include flags for python, bypassing python-config]) @@ -457,6 +491,35 @@ if test "x$test_java_agent_jul" = "xyes" || test "x$test_java_agent_log4j" = "xy fi fi +# set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file +# is not distributed in tarballs +AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no]) +AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"]) + +# enable building man pages +AC_ARG_ENABLE( + build-man-pages, + AS_HELP_STRING( + [--disable-build-man-pages], + [Build man pages (already built in a distributed tarball)] + ), + [build_man_pages=$enableval], + [build_man_pages=yes] +) + +# export man page build condition +AM_CONDITIONAL([BUILD_MAN_PAGES], [test "x$build_man_pages" != "xno"]) + +# check for asciidoc and xmlto if we enabled building the man pages +AS_IF([test "x$build_man_pages" = "xyes"], [ + AC_PATH_PROG([ASCIIDOC], [asciidoc], [no]) + AC_PATH_PROG([XMLTO], [xmlto], [no]) + + AS_IF([test "x$ASCIIDOC" = "xno" || test "x$XMLTO" = "xno"], [ + AC_MSG_ERROR([Both asciidoc and xmlto are needed to build the LTTng man pages.]) + ]) +]) + # Python agent test UST_PYTHON_AGENT="lttngust" @@ -703,8 +766,12 @@ AM_CONDITIONAL([BUILD_LIB_SESSIOND_COMM], [test x$build_lib_sessiond_comm = xyes AM_CONDITIONAL([BUILD_LIB_TESTPOINT], [test x$build_lib_testpoint = xyes]) AM_CONDITIONAL([BUILD_LIB_UST_CONSUMER], [test x$build_lib_ust_consumer = xyes]) +# check for pgrep +AC_PATH_PROG([PGREP], [pgrep], [no]) +AM_CONDITIONAL([HAS_PGREP], [test "x$PGREP" != "xno"]) + if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-parser.h"; then - if test x"$YACC" != "xbison -y"; then + if test x"$(basename "$YACC")" != "xbison -y"; then AC_MSG_ERROR([[bison not found and is required when building from git. Please install bison]]) fi @@ -772,6 +839,7 @@ AC_CONFIG_FILES([ src/bin/lttng/Makefile src/bin/lttng-crash/Makefile tests/Makefile + tests/destructive/Makefile tests/regression/Makefile tests/regression/kernel/Makefile tests/regression/tools/Makefile @@ -786,6 +854,7 @@ AC_CONFIG_FILES([ tests/regression/tools/mi/Makefile tests/regression/tools/wildcard/Makefile tests/regression/tools/crash/Makefile + tests/regression/tools/metadata-regen/Makefile tests/regression/ust/Makefile tests/regression/ust/nprocesses/Makefile tests/regression/ust/high-throughput/Makefile @@ -801,11 +870,14 @@ AC_CONFIG_FILES([ tests/regression/ust/exit-fast/Makefile tests/regression/ust/fork/Makefile tests/regression/ust/libc-wrapper/Makefile + tests/regression/ust/baddr-statedump/Makefile + tests/regression/ust/ust-dl/Makefile tests/regression/ust/java-jul/Makefile tests/regression/ust/java-log4j/Makefile tests/regression/ust/python-logging/Makefile tests/regression/ust/getcpu-override/Makefile tests/regression/ust/clock-override/Makefile + tests/regression/ust/type-declarations/Makefile tests/stress/Makefile tests/unit/Makefile tests/unit/ini_config/Makefile @@ -825,12 +897,23 @@ AC_OUTPUT # # Mini-report on what will be built. # -AS_ECHO() -AS_ECHO("Version name: $version_name") -AS_ECHO("$version_description") +PPRINT_INIT +PPRINT_SET_INDENT(1) +PPRINT_SET_TS(38) + +AS_ECHO +AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-tools $PACKAGE_VERSION \"$version_name\"$PPRINT_COLOR_RST") +AS_ECHO -AS_ECHO() +AS_IF([test -n "$report_fold"], [ + AS_ECHO("`AS_ECHO("$version_description") | $report_fold -s`") +], [ + AS_ECHO("$version_description") +]) + +AS_ECHO +PPRINT_SUBTITLE([Features]) # Target architecture we're building for. target_arch=$host_cpu @@ -843,167 +926,133 @@ for f in $CFLAGS; do fi done ] -AS_ECHO_N("Target architecture: ") -AS_ECHO($target_arch) +PPRINT_PROP_STRING([Target architecture], $target_arch) # kmod enabled/disabled -AS_ECHO_N("libkmod support: ") -AS_IF([test "x$kmod_found" = "xyes"],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) +test "x$kmod_found" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([libkmod support], $value) # LTTng-UST enabled/disabled -AS_ECHO_N("Lttng-UST support: ") -AS_IF([test "x$lttng_ust_support" = "xyes"],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) +test "x$lttng_ust_support" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([LTTng-UST support], $value) -AS_ECHO() -AS_ECHO("Binaries:") +AS_ECHO +PPRINT_SUBTITLE([Binaries]) # List binaries to be built -AS_ECHO_N("lttng: ") -AS_IF([test x$enable_bin_lttng != xno],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) +test x$enable_bin_lttng != xno && value=1 || value=0 +PPRINT_PROP_BOOL([lttng], $value) -AS_ECHO_N("lttng-consumerd: ") -AS_IF([test x$enable_bin_lttng_consumerd != xno],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) - -AS_ECHO_N("lttng-crash: ") -AS_IF([test x$enable_bin_lttng_crash != xno],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) - -AS_ECHO_N("lttng-relayd: ") -AS_IF([test x$enable_bin_lttng_relayd != xno],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) +test x$enable_bin_lttng_consumerd != xno && value=1 || value=0 +PPRINT_PROP_BOOL([lttng-consumerd], $value) -AS_ECHO_N("lttng-sessiond: ") -AS_IF([test x$enable_bin_lttng_sessiond != xno],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) +test x$enable_bin_lttng_crash != xno && value=1 || value=0 +PPRINT_PROP_BOOL([lttng-crash], $value) -AS_ECHO_N("Extras: ") -AS_IF([test x$enable_extras != xno],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) +test x$enable_bin_lttng_relayd != xno && value=1 || value=0 +PPRINT_PROP_BOOL([lttng-relayd], $value) -# Print the bindir and libdir this `make install' will install into. -AS_ECHO() -AS_ECHO_N("Binaries will be installed in: ") -AS_ECHO("`eval eval echo $bindir`") -AS_ECHO_N("Libraries will be installed in: ") -AS_ECHO("`eval eval echo $libdir`") +test x$enable_bin_lttng_sessiond != xno && value=1 || value=0 +PPRINT_PROP_BOOL([lttng-sessiond], $value) +# Extras +test x$enable_extras != xno && value=1 || value=0 +AS_ECHO +PPRINT_SET_INDENT(0) +PPRINT_PROP_BOOL([Extras], $value, $PPRINT_COLOR_SUBTITLE) +PPRINT_SET_INDENT(1) -AS_ECHO() +AS_ECHO +PPRINT_SUBTITLE([Tests]) # Print clear message that tests won't be built AS_IF([test "x$build_tests" = "xno"],[ - AS_ECHO("WARNING: Tests won't be built since some binaries were disabled") + PPRINT_WARN([Tests won't be built since some binaries were disabled]) ]) -AS_ECHO("Tests:") - # LTTng UST Java agent JUL tests enabled/disabled -AS_ECHO_N("LTTng-UST Java agent JUL tests: ") -AS_IF([test "x$test_java_agent_jul" = "xyes"],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) +test "x$test_java_agent_jul" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([LTTng-UST Java agent JUL tests], $value) # LTTng UST Java agent Log4j tests enabled/disabled -AS_ECHO_N("LTTng-UST Java agent Log4j tests: ") -AS_IF([test "x$test_java_agent_log4j" = "xyes"],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) +test "x$test_java_agent_log4j" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL([LTTng-UST Java agent Log4j tests], $value) -AS_ECHO_N("LTTng-UST Python2 agent tests: ") -AS_IF([test ! -z "$PYTHON2_AGENT"],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) +test ! -z "$PYTHON2_AGENT" && value=1 || value=0 +PPRINT_PROP_BOOL([LTTng-UST Python2 agent tests], $value) -AS_ECHO_N("LTTng-UST Python3 agent tests: ") -AS_IF([test ! -z "$PYTHON3_AGENT"],[ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") -]) +test ! -z "$PYTHON3_AGENT" && value=1 || value=0 +PPRINT_PROP_BOOL([LTTng-UST Python3 agent tests], $value) #Python binding enabled/disabled -AS_ECHO_N("Python binding: ") -AS_IF([test "x${enable_python_binding:-yes}" = xyes], [ - AS_ECHO("Enabled") -],[ - AS_ECHO("Disabled") +test "x${enable_python_binding:-yes}" = xyes && value=1 || value=0 +AS_ECHO +PPRINT_SET_INDENT(0) +PPRINT_PROP_BOOL([Python binding], $value, $PPRINT_COLOR_SUBTITLE) +PPRINT_SET_INDENT(1) + +AS_ECHO +PPRINT_SUBTITLE([Man pages]) + +# man pages build enabled/disabled +AS_IF([test "x$build_man_pages" = "xyes"], [ + PPRINT_PROP_BOOL([Build man pages], 1) +], [ + AS_IF([test "x$in_git_repo" = "xyes"], [ + PPRINT_PROP_BOOL([Build man pages], 0) + ], [ + PPRINT_PROP_STRING([Build man pages], [${PPRINT_COLOR_BLDGRN}Already built]) + ]) ]) +# man pages install enabled/disabled (always true in tarball) +test "x$build_man_pages" != "xyes" && test "x$in_git_repo" = "xyes" && value=0 || value=1 +PPRINT_PROP_BOOL([Install man pages], $value) + +report_bindir="`eval eval echo $bindir`" +report_libdir="`eval eval echo $libdir`" + +# Print the bindir and libdir this `make install' will install into. +AS_ECHO +PPRINT_SUBTITLE([Install directories]) +PPRINT_PROP_STRING([Binaries], [$report_bindir]) +PPRINT_PROP_STRING([Libraries], [$report_libdir]) + +AS_ECHO +PPRINT_SUBTITLE([Search directories]) + # If we build the sessiond, print the paths it will use -AS_ECHO() -AS_ECHO_N("The lttng command will search for the lttng-sessiond executable at: ") AS_IF([test "$SESSIOND_BIN" = ""],[ - AS_ECHO_N("`eval eval echo $bindir`") - AS_ECHO("/lttng-sessiond") + path="$report_bindir/lttng-sessiond" ],[ - AS_ECHO("$SESSIOND_BIN") + path="$SESSIOND_BIN" ]) +PPRINT_PROP_STRING([lttng-sessiond executable], [$path]) -AS_ECHO() -AS_ECHO("The sessiond daemon will search the following directories: ") -AS_ECHO_N("32-bit consumerd executable: ") AS_IF([test "$CONSUMERD32_BIN" = ""],[ - AS_ECHO_N("`eval eval echo $lttnglibexecdir`") - AS_ECHO("/lttng-consumerd") + path="`eval eval echo $lttnglibexecdir`/lttng-consumerd" ],[ - AS_ECHO("$CONSUMERD32_BIN") + path="$CONSUMERD32_BIN" ]) +PPRINT_PROP_STRING([32-bit lttng-consumerd executable], [$path]) -AS_ECHO_N("32-bit consumer libraries: ") AS_IF([test "$CONSUMERD32_LIBDIR" = ""],[ - AS_ECHO("`eval eval echo $libdir`") + path="`eval eval echo $libdir`" ],[ - AS_ECHO("$CONSUMERD32_LIBDIR") + path="$CONSUMERD32_LIBDIR" ]) +PPRINT_PROP_STRING([32-bit consumer libraries], [$path]) -AS_ECHO_N("64-bit consumerd executable: ") AS_IF([test "$CONSUMERD64_BIN" = ""],[ - AS_ECHO_N("`eval eval echo $lttnglibexecdir`") - AS_ECHO("/lttng-consumerd") + path="`eval eval echo $lttnglibexecdir`/lttng-consumerd" ],[ - AS_ECHO("$CONSUMERD64_BIN") + path="$CONSUMERD64_BIN" ]) +PPRINT_PROP_STRING([64-bit lttng-consumerd executable], [$path]) -AS_ECHO_N("64-bit consumer libraries: ") AS_IF([test "$CONSUMERD64_LIBDIR" = ""],[ - AS_ECHO("`eval eval echo $libdir`") + path="`eval eval echo $libdir`" ],[ - AS_ECHO("$CONSUMERD64_LIBDIR") + path="$CONSUMERD64_LIBDIR" ]) - -AS_ECHO() - +PPRINT_PROP_STRING([64-bit consumer libraries], [$path])