X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=ab72dbe5e4f1d2807b6b3ffcd846a453d4e59dbe;hp=ef9894cc9ed76fa7c6794cce56276f7c69acd1e6;hb=192ac418bed152e8655e250e723d3c6b8814c747;hpb=062fc3d82f245d6166457ebb0af9ea38abc30378 diff --git a/configure.ac b/configure.ac index ef9894cc9..ab72dbe5e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ([2.64]) -AC_INIT([lttng-tools],[2.8.0],[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]) @@ -14,6 +14,8 @@ AM_MAINTAINER_MODE([enable]) # Enable silent rules if available (Introduced in AM 1.11) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AC_REQUIRE_AUX_FILE([tap-driver.sh]) + # Checks for C compiler AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE @@ -75,8 +77,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="Isseki Nicho" -version_description='The result of a collaboration between Dieu du Ciel! and Nagano-based Shiga Kogen, Isseki Nicho is a strong Imperial Dark Saison offering a rich roasted malt flavor combined with a complex fruity finish typical of Saison yeasts.' +version_name="Codename TBD" +version_description='Description TBD' version_description_c=$(echo $version_description | $SED 's/"/\\"/g') AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "") @@ -125,6 +127,10 @@ AC_CHECK_FUNCS([ \ strtoull dirfd gethostbyname2 getipnodebyname epoll_create1 \ ]) +# Check if clock_gettime, timer_create, timer_settime, and timer_delete are available in lib rt, and if so, +# add -lrt to LIBS +AC_CHECK_LIB([rt], [clock_gettime, timer_create, timer_settime, timer_delete]) + # Babeltrace viewer check AC_ARG_WITH([babeltrace-bin], AS_HELP_STRING([--with-babeltrace-bin], @@ -211,6 +217,82 @@ AC_DEFINE_UNQUOTED([CONFIG_LTTV_GUI_BIN], "$LTTV_GUI_BIN", [Location of the lttv AC_DEFINE_UNQUOTED([CONFIG_SESSIOND_BIN], "$SESSIOND_BIN", [Location of the sessiond executable.]) AC_DEFINE_UNQUOTED([CONFIG_LTTNG_SYSTEM_RUNDIR], ["$LTTNG_SYSTEM_RUNDIR"], [LTTng system runtime directory]) +AC_DEFUN([_AC_DEFINE_AND_SUBST], [ + AC_DEFINE_UNQUOTED([CONFIG_$1], [$2], [$1]) + $1="$2" + AC_SUBST([$1]) +]) + +AC_DEFUN([_AC_DEFINE_QUOTED_AND_SUBST], [ + AC_DEFINE_UNQUOTED([CONFIG_$1], ["$2"], [$1]) + $1="$2" + AC_SUBST([$1]) +]) + +# Default values +m4_define([_DEFAULT_CHANNEL_SUBBUF_SIZE], [4096]) +m4_define([_DEFAULT_CHANNEL_SUBBUF_NUM], [4]) +m4_define([_DEFAULT_CHANNEL_SWITCH_TIMER], [0]) +m4_define([_DEFAULT_CHANNEL_LIVE_TIMER], [0]) +m4_define([_DEFAULT_CHANNEL_READ_TIMER], [200000]) +_AC_DEFINE_AND_SUBST([DEFAULT_AGENT_TCP_PORT], [5345]) +_AC_DEFINE_AND_SUBST([DEFAULT_APP_SOCKET_RW_TIMEOUT], [5]) +_AC_DEFINE_AND_SUBST([DEFAULT_CHANNEL_SUBBUF_SIZE], [_DEFAULT_CHANNEL_SUBBUF_SIZE]) +_AC_DEFINE_AND_SUBST([DEFAULT_CHANNEL_TRACEFILE_COUNT], [0]) +_AC_DEFINE_AND_SUBST([DEFAULT_CHANNEL_TRACEFILE_SIZE], [0]) +_AC_DEFINE_AND_SUBST([DEFAULT_KERNEL_CHANNEL_LIVE_TIMER], [_DEFAULT_CHANNEL_LIVE_TIMER]) +_AC_DEFINE_AND_SUBST([DEFAULT_KERNEL_CHANNEL_READ_TIMER], [_DEFAULT_CHANNEL_READ_TIMER]) +_AC_DEFINE_AND_SUBST([DEFAULT_KERNEL_CHANNEL_SUBBUF_NUM], [_DEFAULT_CHANNEL_SUBBUF_NUM]) +_AC_DEFINE_AND_SUBST([DEFAULT_KERNEL_CHANNEL_SUBBUF_SIZE], [262144]) +_AC_DEFINE_AND_SUBST([DEFAULT_KERNEL_CHANNEL_SWITCH_TIMER], [_DEFAULT_CHANNEL_SWITCH_TIMER]) +_AC_DEFINE_AND_SUBST([DEFAULT_LTTNG_LIVE_TIMER], [1000000]) +_AC_DEFINE_AND_SUBST([DEFAULT_METADATA_CACHE_SIZE], [4096]) +_AC_DEFINE_AND_SUBST([DEFAULT_METADATA_READ_TIMER], [0]) +_AC_DEFINE_AND_SUBST([DEFAULT_METADATA_SUBBUF_NUM], [2]) +_AC_DEFINE_AND_SUBST([DEFAULT_METADATA_SUBBUF_SIZE], [4096]) +_AC_DEFINE_AND_SUBST([DEFAULT_METADATA_SWITCH_TIMER], [_DEFAULT_CHANNEL_SWITCH_TIMER]) +_AC_DEFINE_AND_SUBST([DEFAULT_NETWORK_CONTROL_PORT], [5342]) +_AC_DEFINE_AND_SUBST([DEFAULT_NETWORK_DATA_PORT], [5343]) +_AC_DEFINE_AND_SUBST([DEFAULT_NETWORK_VIEWER_PORT], [5344]) +_AC_DEFINE_AND_SUBST([DEFAULT_UST_PID_CHANNEL_LIVE_TIMER], [_DEFAULT_CHANNEL_LIVE_TIMER]) +_AC_DEFINE_AND_SUBST([DEFAULT_UST_PID_CHANNEL_READ_TIMER], [0]) +_AC_DEFINE_AND_SUBST([DEFAULT_UST_PID_CHANNEL_SUBBUF_NUM], [_DEFAULT_CHANNEL_SUBBUF_NUM]) +_AC_DEFINE_AND_SUBST([DEFAULT_UST_PID_CHANNEL_SUBBUF_SIZE], [_DEFAULT_CHANNEL_SUBBUF_SIZE]) +_AC_DEFINE_AND_SUBST([DEFAULT_UST_PID_CHANNEL_SWITCH_TIMER], [_DEFAULT_CHANNEL_SWITCH_TIMER]) +_AC_DEFINE_AND_SUBST([DEFAULT_UST_UID_CHANNEL_LIVE_TIMER], [_DEFAULT_CHANNEL_LIVE_TIMER]) +_AC_DEFINE_AND_SUBST([DEFAULT_UST_UID_CHANNEL_READ_TIMER], [0]) +_AC_DEFINE_AND_SUBST([DEFAULT_UST_UID_CHANNEL_SUBBUF_NUM], [_DEFAULT_CHANNEL_SUBBUF_NUM]) +_AC_DEFINE_AND_SUBST([DEFAULT_UST_UID_CHANNEL_SUBBUF_SIZE], [131072]) +_AC_DEFINE_AND_SUBST([DEFAULT_UST_UID_CHANNEL_SWITCH_TIMER], [_DEFAULT_CHANNEL_SWITCH_TIMER]) +_AC_DEFINE_QUOTED_AND_SUBST([DEFAULT_AGENT_BIND_ADDRESS], [localhost]) +_AC_DEFINE_QUOTED_AND_SUBST([DEFAULT_NETWORK_CONTROL_BIND_ADDRESS], [0.0.0.0]) +_AC_DEFINE_QUOTED_AND_SUBST([DEFAULT_NETWORK_DATA_BIND_ADDRESS], [0.0.0.0]) +_AC_DEFINE_QUOTED_AND_SUBST([DEFAULT_NETWORK_VIEWER_BIND_ADDRESS], [localhost]) + +# Command short descriptions +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_ADD_CONTEXT], [Add context fields to a channel]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_CALIBRATE], [Quantify LTTng overhead]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_CREATE], [Create a tracing session]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_DESTROY], [Tear down tracing sessions]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_DISABLE_CHANNEL], [Disable tracing channels]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_DISABLE_EVENT], [Disable event rules]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_ENABLE_CHANNEL], [Create or enable tracing channels]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_ENABLE_EVENT], [Create or enable event rules]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_HELP], [Display help information about a command]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_LIST], [List tracing sessions, domains, channels, and events]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_LOAD], [Load tracing session configurations]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_METADATA], [Manage an LTTng tracing session's metadata generation]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_SAVE], [Save tracing session configurations]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_SET_SESSION], [Set current tracing session]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_SNAPSHOT], [Snapshot buffers of current tracing session]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_START], [Start tracing]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_STATUS], [Get the status of the current tracing session]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_STOP], [Stop tracing]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_TRACK], [Track specific system resources]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_UNTRACK], [Untrack specific system resources]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_VERSION], [Show version information]) +_AC_DEFINE_QUOTED_AND_SUBST([CMD_DESCR_VIEW], [Start trace viewer]) + if test "x$prefix" = "xNONE"; then prefix=$ac_default_prefix fi @@ -242,23 +324,30 @@ PKG_CHECK_MODULES([POPT], [popt], ] ) -AM_PATH_XML2(2.7.6, true, AC_MSG_ERROR(No supported version of libxml2 found.)) +PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7.6]) -# Check for libuuid +# Check for uuid in system libs +AC_CHECK_FUNCS([uuid_generate], +[ + AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.]) + link_with_libuuid=no +], +[ +# First, check the pkg-config module is available, otherwise explicitly check +# for libuuid, or uuid support in the C-library. PKG_CHECK_MODULES([UUID], [uuid], [ LIBS="$LIBS $UUID_LIBS" AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.]) - have_libuuid=yes + link_with_libuuid=yes ], [ - 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.]) + # Check for libuuid AC_CHECK_LIB([uuid], [uuid_generate], [ AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.]) - have_libuuid=yes + link_with_libuuid=yes ], [ # libuuid not found, check for uuid_create in libc. @@ -266,7 +355,7 @@ PKG_CHECK_MODULES([UUID], [uuid], [uuid_create], [ AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) - have_libc_uuid=yes + link_with_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]) @@ -275,37 +364,37 @@ PKG_CHECK_MODULES([UUID], [uuid], ] ) ]) -AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"]) -AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"]) +]) + +AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBUUID], [test "x$link_with_libuuid" = "xyes"]) +AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBC_UUID], [test "x$link_with_libc_uuid" = "xyes"]) + +AC_CHECK_FUNC([clock_gettime], [AC_DEFINE_UNQUOTED([LTTNG_HAVE_CLOCK_GETTIME], 1, [Has clock_gettime() support.])]) # URCU library version needed or newer -liburcu_version=">= 0.8.0" +m4_define([WRONG_LIBURCU_MSG], [Userspace RCU (liburcu) >= 0.8.0 is needed]) # Check liburcu needed function calls AC_CHECK_DECL([cds_list_add], [], - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include ]] -) + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]]) AC_CHECK_DECL([cds_wfcq_init], [], - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include ]] -) + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]]) AC_CHECK_DECL([cds_wfcq_dequeue_blocking], [], - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include ]] -) + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]]) AC_CHECK_DECL([futex_async], [], - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include ]] -) + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]]) AC_CHECK_DECL([rcu_thread_offline], [], - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include ]] -) + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]]) AC_CHECK_DECL([rcu_thread_online], [], - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include ]] -) + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]]) AC_CHECK_DECL([caa_likely], [], - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include ]] -) + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]]) +AC_CHECK_LIB([urcu-cds], [_cds_lfht_new], [], + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])]) + #Function added in urcu 0.7.0 AC_CHECK_DECL([cmm_smp_mb__before_uatomic_or], [], - [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include ]] + [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]] ) # Check kmod library @@ -320,7 +409,7 @@ AC_ARG_WITH(kmod-prefix, AC_ARG_ENABLE(kmod, AS_HELP_STRING([--disable-kmod],[build without kmod support]), - kmod_support=zz$enableval, kmod_support=yes) + kmod_support=$enableval, kmod_support=yes) AS_IF([test "x$kmod_support" = "xyes"], [ AC_CHECK_LIB([kmod], [kmod_module_probe_insert_module], @@ -409,12 +498,13 @@ swig_version=2.0.0 AC_ARG_ENABLE([python-bindings], [AC_HELP_STRING([--enable-python-bindings], [compile Python bindings])], - [enable_python_binding=yes], [enable_python_binding=no]) + [enable_python_binding=$enableval], [enable_python_binding=no]) -AM_CONDITIONAL([PYTHON_BINDING], [test "x${enable_python_binding:-yes}" = xyes]) +AM_CONDITIONAL([PYTHON_BINDING], [test "x$enable_python_binding" = xyes]) -if test "x${enable_python_binding:-yes}" = xyes; then +if test "x$enable_python_binding" = 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]) @@ -495,30 +585,59 @@ fi 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 +# enable building man pages (user's intention) AC_ARG_ENABLE( - build-man-pages, + man-pages, AS_HELP_STRING( - [--enable-build-man-pages], - [Build man pages (already built in a distributed tarball)] + [--disable-man-pages], + [Do not build and install man pages (already built in a distributed tarball)] ), - [enable_build_man_pages=yes], - [enable_build_man_pages=no] + [man_pages_opt=$enableval], + [man_pages_opt=yes] ) -# export man page build condition -AM_CONDITIONAL([BUILD_MAN_PAGES], [test "x$enable_build_man_pages" != "xno"]) - # check for asciidoc and xmlto if we enabled building the man pages -AS_IF([test "x$enable_build_man_pages" = "xyes"], [ +have_asciidoc_xmlto=no + +AS_IF([test "x$man_pages_opt" = "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.]) + AS_IF([test "x$in_git_repo" = "xyes"], [ + # this is an error because we're in the Git repo, which + # means the man pages are not already generated for us, + # thus asciidoc/xmlto are required because we were asked + # to build the man pages + AC_MSG_ERROR([ +Both asciidoc and xmlto are needed to build the LTTng man pages. Use +--disable-man-pages to disable building the man pages, in which case +they will not be installed. + ]) + ], [ + # only warn here: since we're in the tarball, the man + # pages should already be generated at this point, thus + # asciidoc/xmlto are not strictly required + AC_MSG_WARN([ +Both asciidoc and xmlto are needed to build the LTTng man pages. Note +that the man pages are already built in this distribution tarball, so +asciidoc and xmlto are only needed if you intend to modify their +sources. Use --disable-man-pages to completely disable building +and installing the man pages. + ]) + ]) + ], [ + have_asciidoc_xmlto=yes ]) ]) +# export man page build condition: build the man pages if the user +# asked for it, and if the tools are available +AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"]) +AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"]) + +AC_DEFINE_UNQUOTED([MANPATH], ["`eval eval echo $mandir`"], [Path to man pages.]) + # Python agent test UST_PYTHON_AGENT="lttngust" @@ -769,27 +888,49 @@ AM_CONDITIONAL([BUILD_LIB_UST_CONSUMER], [test x$build_lib_ust_consumer = xyes]) 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"$(basename "$YACC")" != "xbison -y"; then - AC_MSG_ERROR([[bison not found and is required when building from git. - Please install bison]]) - fi - AC_PATH_PROG([BISON],[bison]) - AX_PROG_BISON_VERSION([2.4], [],[ - AC_MSG_ERROR([[Bison >= 2.4 is required when building from git]]) +# check for bison +have_bison=yes + +AS_IF([test "x$(basename "$YACC")" != "xbison -y"], [have_bison=no]) +AC_PATH_PROG([BISON], [bison]) +AX_PROG_BISON_VERSION([2.4], [], [have_bison=no]) + +AS_IF([test "x$have_bison" = "xno"], [ + AS_IF([test "x$in_git_repo" = "xyes"], [ + AC_MSG_ERROR([Bison >= 2.4 is required when building from the Git repository.]) + ], [ + AC_MSG_WARN([ +Missing Bison >= 2.4. Note that the parser files are already built in +this distribution tarball, so Bison is only needed if you intend to +modify their sources. + ]) ]) -fi +]) -if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-lexer.c"; then - if test x"$LEX" != "xflex"; then - AC_MSG_ERROR([[flex not found and is required when building from git. - Please install flex]]) - fi - AC_PATH_PROG([FLEX],[flex]) - AX_PROG_FLEX_VERSION([2.5.35], [],[ - AC_MSG_ERROR([[Flex >= 2.5.35 is required when building from git]]) +# export bison condition +AM_CONDITIONAL([HAVE_BISON], [test "x$have_bison" = "xyes"]) + +# check for flex +have_flex=yes + +AS_IF([test "x$LEX" != "xflex"], [have_flex=no]) +AC_PATH_PROG([FLEX], [flex]) +AX_PROG_FLEX_VERSION([2.5.35], [], [have_flex=no]) + +AS_IF([test "x$have_flex" = "xno"], [ + AS_IF([test "x$in_git_repo" = "xyes"], [ + AC_MSG_ERROR([Flex >= 2.5.35 is required when building from the Git repository.]) + ], [ + AC_MSG_WARN([ +Missing Flex >= 2.5.35. Note that the lexer files are already built in +this distribution tarball, so Flex is only needed if you intend to +modify their sources. + ]) ]) -fi +]) + +# export flex condition +AM_CONDITIONAL([HAVE_FLEX], [test "x$have_flex" = "xyes"]) CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing" @@ -807,6 +948,7 @@ AC_CONFIG_FILES([ Makefile doc/Makefile doc/man/Makefile + doc/man/asciidoc-attrs.conf include/Makefile extras/Makefile extras/bindings/Makefile @@ -850,10 +992,12 @@ AC_CONFIG_FILES([ tests/regression/tools/live/Makefile tests/regression/tools/exclusion/Makefile tests/regression/tools/save-load/Makefile + tests/regression/tools/save-load/configuration/Makefile tests/regression/tools/mi/Makefile tests/regression/tools/wildcard/Makefile tests/regression/tools/crash/Makefile - tests/regression/tools/metadata-regen/Makefile + tests/regression/tools/regen-metadata/Makefile + tests/regression/tools/regen-statedump/Makefile tests/regression/ust/Makefile tests/regression/ust/nprocesses/Makefile tests/regression/ust/high-throughput/Makefile @@ -877,6 +1021,7 @@ AC_CONFIG_FILES([ tests/regression/ust/getcpu-override/Makefile tests/regression/ust/clock-override/Makefile tests/regression/ust/type-declarations/Makefile + tests/regression/ust/rotation-destroy-flush/Makefile tests/stress/Makefile tests/unit/Makefile tests/unit/ini_config/Makefile @@ -984,30 +1129,33 @@ test ! -z "$PYTHON3_AGENT" && value=1 || value=0 PPRINT_PROP_BOOL([LTTng-UST Python3 agent tests], $value) #Python binding enabled/disabled -test "x${enable_python_binding:-yes}" = xyes && value=1 || value=0 +test "x$enable_python_binding" = 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 -test "x$enable_build_man_pages" = "xyes" && value=1 || value=0 -AS_IF([test "x$enable_build_man_pages" = "xyes"], [ - PPRINT_PROP_BOOL([Build man pages], 1) -], [ +m4_pushdef([build_man_pages_msg], [Build and install man pages]) + +AS_IF([test "x$man_pages_opt" != "xno"], [ AS_IF([test "x$in_git_repo" = "xyes"], [ - PPRINT_PROP_BOOL([Build man pages], 0) + PPRINT_PROP_BOOL([build_man_pages_msg], 1, $PPRINT_COLOR_SUBTITLE) ], [ - PPRINT_PROP_STRING([Build man pages], [${PPRINT_COLOR_BLDGRN}Already built]) + AS_IF([test "x$have_asciidoc_xmlto" = "xyes"], [ + PPRINT_PROP_BOOL([build_man_pages_msg], 1, $PPRINT_COLOR_SUBTITLE) + ], [ + PPRINT_PROP_STRING([build_man_pages_msg], + [${PPRINT_COLOR_BLDGRN}yes (already built)], + $PPRINT_COLOR_SUBTITLE) + ]) ]) +], [ + PPRINT_PROP_BOOL([build_man_pages_msg], 0, $PPRINT_COLOR_SUBTITLE) ]) -# man pages install enabled/disabled (always true in tarball) -test "x$enable_build_man_pages" = "xno" && test "x$in_git_repo" = "xyes" && value=0 || value=1 -PPRINT_PROP_BOOL([Install man pages], $value) +m4_popdef([build_man_pages_msg]) + +PPRINT_SET_INDENT(1) report_bindir="`eval eval echo $bindir`" report_libdir="`eval eval echo $libdir`"