X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=24e74601167efc7c993675c5d22d0cb82bab30b3;hp=ef9894cc9ed76fa7c6794cce56276f7c69acd1e6;hb=1113825053b8f8ff141ffdc375bab04f9e78932b;hpb=062fc3d82f245d6166457ebb0af9ea38abc30378 diff --git a/configure.ac b/configure.ac index ef9894cc9..24e746011 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"], "") @@ -279,33 +281,29 @@ AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"]) AM_CONDITIONAL([LTTNG_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"]) # 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 @@ -415,6 +413,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]) @@ -495,30 +494,57 @@ 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], + [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"]) + # Python agent test UST_PYTHON_AGENT="lttngust" @@ -769,27 +795,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" @@ -988,26 +1036,29 @@ 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 -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`"