X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=1f80ffe0a952667b98e3beb10597a930e1d217a1;hb=0c2f844420608b1865b77cff1e84ce01bb9e3937;hp=bc119c38c4c44e5619b7eada4a734284b54c06bb;hpb=8a36ff81a49e70d53e56942ea7d5db4f49b185f0;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index bc119c38..1f80ffe0 100644 --- a/configure.ac +++ b/configure.ac @@ -1,41 +1,44 @@ -# SPDX-License-Identifier: LGPL-2.1-only - -dnl Version infos -m4_define([V_MAJOR], [2]) -m4_define([V_MINOR], [13]) -m4_define([V_PATCH], [0]) -m4_define([V_EXTRA], [pre]) -m4_define([V_NAME], [[Codename TBD]]) -m4_define([V_DESC], [[Description TBD]]) - -m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH]) -m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])]) - -AC_PREREQ([2.69]) -AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com], [], [https://lttng.org]) - -dnl Substitute minor/major/patchlevel version numbers -AC_SUBST([MAJOR_VERSION], [V_MAJOR]) -AC_SUBST([MINOR_VERSION], [V_MINOR]) -AC_SUBST([PATCHLEVEL_VERSION], [V_PATCH]) +dnl SPDX-License-Identifier: LGPL-2.1-only +dnl +dnl Copyright (C) 2021 EfficiOS, Inc. +dnl +dnl Process this file with autoconf to produce a configure script. + + +# Project version information +m4_define([ust_version_major], [2]) +m4_define([ust_version_minor], [13]) +m4_define([ust_version_patch], [0]) +m4_define([ust_version_dev_stage], [-pre]) +m4_define([ust_version], ust_version_major[.]ust_version_minor[.]ust_version_patch[]ust_version_dev_stage) +m4_define([ust_version_name], [[Codename TBD]]) +m4_define([ust_version_description], [[Description TBD]]) + +# Library version information of "liblttng-ust" +# Following the numbering scheme proposed by libtool for the library version +# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +m4_define([ust_lib_version_current], [1]) +m4_define([ust_lib_version_revision], [0]) +m4_define([ust_lib_version_age], [0]) +m4_define([ust_lib_version], ust_lib_version_current[:]ust_lib_version_revision[:]ust_lib_version_age) +# Library version information of "liblttng-ust-ctl" # Following the numbering scheme proposed by libtool for the library version # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -# This is the library version of liblttng-ust. -m4_define([UST_LIB_V_MAJOR], [1]) -m4_define([UST_LIB_V_MINOR], [0]) -m4_define([UST_LIB_V_PATCH], [0]) +m4_define([ust_ctl_lib_version_current], [5]) +m4_define([ust_ctl_lib_version_revision], [0]) +m4_define([ust_ctl_lib_version_age], [0]) +m4_define([ust_ctl_lib_version], ust_ctl_lib_version_current[:]ust_ctl_lib_version_revision[:]ust_ctl_lib_version_age) + -AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [UST_LIB_V_MAJOR:UST_LIB_V_MINOR:UST_LIB_V_PATCH]) -AC_DEFINE([CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR], [UST_LIB_V_MAJOR], [Major SONAME number of the ust library]) -# note: remember to update tracepoint.h dlopen() to match this version -# number. TODO: eventually automate by exporting the major number. +## ## +## Autoconf base setup ## +## ## -# This is the library version of liblttng-ust-ctl, used internally by -# liblttng-ust, lttng-sessiond, and lttng-consumerd. -AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [5:0:0]) +AC_PREREQ([2.69]) +AC_INIT([lttng-ust],[ust_version],[mathieu dot desnoyers at efficios dot com],[],[https://lttng.org]) -AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h]) +AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h include/lttng/ust-version.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([include/lttng/tracepoint.h]) @@ -43,6 +46,11 @@ AC_CONFIG_SRCDIR([include/lttng/tracepoint.h]) AC_CANONICAL_TARGET AC_CANONICAL_HOST + +## ## +## Automake base setup ## +## ## + AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc -Wall -Wno-portability -Werror]) AM_MAINTAINER_MODE([enable]) @@ -55,10 +63,8 @@ AC_SYS_LARGEFILE AC_PROG_CC # AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70 m4_version_prereq([2.70], [], [AC_PROG_CC_STDC]) -AC_PROG_CXX -AX_CXX_COMPILE_STDCXX([11]) -RW_PROG_CXX_WORKS -AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) +AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) +AM_CONDITIONAL([HAVE_CXX], [test "$HAVE_CXX11" = "1"]) # Check if the compiler support weak symbols AX_SYS_WEAK_ALIAS @@ -74,8 +80,8 @@ AC_PROG_GREP AC_PROG_LN_S AC_PROG_MKDIR_P AC_PROG_MAKE_SET -AC_CHECK_PROG([HAVE_CMAKE], [cmake], ["yes"]) -AM_CONDITIONAL([HAVE_CMAKE], [test "x$HAVE_CMAKE" = "xyes"]) +AC_CHECK_PROG([CMAKE], [cmake]) +AM_CONDITIONAL([HAVE_CMAKE], [test "x$CMAKE" != "x"]) # libtool link_all_deplibs fixup. See http://bugs.lttng.org/issues/321. AC_ARG_ENABLE([libtool-linkdep-fixup], [ @@ -196,18 +202,16 @@ AS_CASE([$host_cpu], [ppc64le], [], [powerpc64], [], [powerpc64le], [], - [s390], [NO_UNALIGNED_ACCESS=1], - [s390x], [NO_UNALIGNED_ACCESS=1], + [s390], [], + [s390x], [], [arm*], [ - NO_UNALIGNED_ACCESS=1 NO_NUMA=1 ], - [aarch64*], [NO_UNALIGNED_ACCESS=1], - [mips*], [NO_UNALIGNED_ACCESS=1], - [tile*], [NO_UNALIGNED_ACCESS=1], + [aarch64*], [], + [mips*], [], + [tile*], [], [ UNSUPPORTED_ARCH=1 - NO_UNALIGNED_ACCESS=1 ]) # Set os specific options @@ -216,7 +220,6 @@ AS_CASE([$host_os], ) # Configuration options, which will be installed in the config.h -AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.]) AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h]) # Checks for libraries. @@ -250,7 +253,7 @@ AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], [ ac_cv_have_decl_RTLD_DI_LINKMAP="no" ]) -AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"]) +AM_CONDITIONAL([ENABLE_UST_DL], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"]) # Require URCU >= 0.12 for DEFINE_URCU_TLS_INIT PKG_CHECK_MODULES([URCU], [liburcu >= 0.12]) @@ -274,7 +277,7 @@ AS_IF([test "x$enable_numa" = "xyes"], [ [AC_MSG_ERROR([libnuma is not available. Please either install it (e.g. libnuma-dev) or use [LDFLAGS]=-Ldir to specify the right location, or use --disable-numa configure argument to disable NUMA support.])]) have_libnuma=yes ]) -AM_CONDITIONAL([HAVE_LIBNUMA], [test "x$have_libnuma" = "xyes"]) +AM_CONDITIONAL([ENABLE_NUMA], [test "x$have_libnuma" = "xyes"]) # optional linux/perf_event.h AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes], []) @@ -288,10 +291,6 @@ AS_IF([test "x$have_perf_event" = "xyes"], [ AC_DEFINE([HAVE_PERF_EVENT], [1]) ]) -AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [ - AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) -]) - # Check for JNI header files if requested AC_ARG_ENABLE([jni-interface], [ AS_HELP_STRING([--enable-jni-interface], [build JNI interface between C and Java. Needs Java include files [default=no]]) @@ -301,7 +300,7 @@ AS_HELP_STRING([--enable-jni-interface], [build JNI interface between C and Java jni_interface=no ]) -AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"]) +AM_CONDITIONAL([ENABLE_JNI_INTERFACE], [test "x$jni_interface" = "xyes"]) AC_ARG_ENABLE([java-agent-jul], [ @@ -327,9 +326,9 @@ AS_HELP_STRING([--enable-java-agent-all], [build the LTTng UST Java agent with a java_agent_log4j=$enableval ], [:]) -AM_CONDITIONAL([BUILD_JAVA_AGENT], [test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"]) -AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_JUL], [test "x$java_agent_jul" = "xyes"]) -AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_LOG4J], [test "x$java_agent_log4j" = "xyes"]) +AM_CONDITIONAL([ENABLE_JAVA_AGENT], [test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"]) +AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_JUL], [test "x$java_agent_jul" = "xyes"]) +AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_LOG4J], [test "x$java_agent_log4j" = "xyes"]) AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"], [ AX_JAVA_OPTIONS @@ -366,7 +365,7 @@ AS_HELP_STRING([--enable-python-agent], [build the LTTng UST Python agent [defau ], [ python_agent=$enableval ], [:]) -AM_CONDITIONAL([BUILD_PYTHON_AGENT], [test "x$python_agent" = "xyes"]) +AM_CONDITIONAL([ENABLE_PYTHON_AGENT], [test "x$python_agent" = "xyes"]) AS_IF([test "x$python_agent" = "xyes"], [ AM_PATH_PYTHON([2.7]) ]) @@ -408,8 +407,8 @@ AS_HELP_STRING([--with-lttng-system-rundir], [Location of the system directory w AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], [LTTng system runtime directory]) -AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES], [python], ["yes"]) -AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"]) +AC_CHECK_PROG([ENABLE_GEN_TP_EXAMPLES], [python], ["yes"]) +AM_CONDITIONAL([ENABLE_GEN_TP_EXAMPLES], [test "x$ENABLE_GEN_TP_EXAMPLES" = "xyes"]) # Enable building examples AC_ARG_ENABLE( @@ -424,11 +423,6 @@ AC_ARG_ENABLE( AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" != "xno"]) -# 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 (user's intention). AC_ARG_ENABLE( man-pages, @@ -449,7 +443,7 @@ AS_IF([test "x$man_pages_opt" = "xyes"], [ AC_PATH_PROG([XMLTO], [xmlto], [no]) AS_IF([test "x$ASCIIDOC" = "xno" || test "x$XMLTO" = "xno"], [ - AS_IF([test "x$in_git_repo" = "xyes"], [ + AE_IF_IN_GIT_REPO([ # 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 @@ -472,17 +466,18 @@ they will not be installed. # 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([ENABLE_MAN_PAGES], [test "x$man_pages_opt" != "xno"]) AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"]) -# Default values -AC_DEFUN([_AC_DEFINE_AND_SUBST], [ - AC_DEFINE_UNQUOTED([CONFIG_$1], [$2], [$1]) - $1="$2" - AC_SUBST([$1]) -]) -_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000]) +# Defined in include/lttng/ust-version.h +AC_DEFINE([LTTNG_UST_MAJOR_VERSION], ust_version_major, [LTTng UST major version]) +AC_DEFINE([LTTNG_UST_MINOR_VERSION], ust_version_minor, [LTTng UST minor version]) +AC_DEFINE([LTTNG_UST_PATCHLEVEL_VERSION], ust_version_patch, [LTTng UST patch version]) +AC_DEFINE([LTTNG_UST_VERSION], ["]ust_version["], [LTTng UST version string]) +AC_DEFINE([LTTNG_UST_LIB_SONAME_MAJOR], [ust_lib_version_current], [Major SONAME number of liblttng-ust]) +AC_DEFINE([LTTNG_UST_CTL_LIB_SONAME_MAJOR], [ust_ctl_lib_version_current], [Major SONAME number of liblttng-ust-ctl]) + AM_CFLAGS="-Wall $URCU_CFLAGS $PTHREAD_CFLAGS" AC_SUBST(AM_CFLAGS) @@ -498,13 +493,18 @@ AC_SUBST(AM_CPPFLAGS) AC_SUBST(JNI_CPPFLAGS) + +## ## +## Output files generated by configure ## +## ## + +# List of files to be generated from '.in' templates by AC_OUTPUT AC_CONFIG_FILES([ Makefile doc/Makefile doc/examples/Makefile doc/man/Makefile include/Makefile - include/lttng/ust-version.h snprintf/Makefile libcounter/Makefile libmsgpack/Makefile @@ -557,28 +557,36 @@ AC_CONFIG_FILES([ AC_OUTPUT -# -# Mini-report on what will be built. -# +## ## +## Mini-report on what will be built. ## +## ## PPRINT_INIT PPRINT_SET_INDENT(1) PPRINT_SET_TS(38) AS_ECHO -AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION \"V_NAME\"$PPRINT_COLOR_RST") +AS_IF([test -n "ust_version_name"], [ + AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION \"ust_version_name\"$PPRINT_COLOR_RST") +], [ + AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION") +]) + AS_ECHO -AS_ECHO("V_DESC") +AS_IF([test -n "ust_version_description"], [ + AS_IF([test -n "$FOLD"], [ + AS_ECHO("`AS_ECHO("ust_version_description") | $FOLD -s`") + ], [ + AS_ECHO("ust_version_description") + ]) + AS_ECHO +]) -AS_ECHO PPRINT_SUBTITLE([System]) PPRINT_PROP_STRING([Target architecture], $host_cpu) -test "x$NO_UNALIGNED_ACCESS" != "x1" && value=1 || value=0 -PPRINT_PROP_BOOL([Efficient unaligned memory access], $value) - AS_IF([test "x$UNSUPPORTED_ARCH" = "x1"],[ PPRINT_WARN([Your architecture ($host_cpu) is unsupported, using safe default of no unaligned access.]) ]) @@ -618,7 +626,7 @@ PPRINT_PROP_BOOL([Build and install examples], $value, $PPRINT_COLOR_SUBTITLE) 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"], [ + AE_IF_IN_GIT_REPO([ PPRINT_PROP_BOOL([build_man_pages_msg], 1, $PPRINT_COLOR_SUBTITLE) ], [ AS_IF([test "x$have_asciidoc_xmlto" = "xyes"], [