X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=a987d95c18867f7ccd25f2668522cc53d33dddce;hb=c0c0989ab70574e09b2f7e8b48c2da6af664a849;hp=8a5b664648397aa1ed1227c794a8b6d787c62cec;hpb=bfcda6cea270952898ea122c375f2ed19105adef;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 8a5b6646..a987d95c 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,17 @@ +# SPDX-License-Identifier: LGPL-2.1-only + dnl Version infos m4_define([V_MAJOR], [2]) -m4_define([V_MINOR], [10]) +m4_define([V_MINOR], [13]) m4_define([V_PATCH], [0]) -m4_define([V_EXTRA], [rc1]) -m4_define([V_NAME], [[KeKriek]]) -m4_define([V_DESC], [[From Brasserie Dunham, a sour mashed golden wheat ale fermented with local sour cherries from Tougas orchards. Fresh sweet cherry notes with some tartness, lively carbonation with a dry finish.]]) +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.59) +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 @@ -20,7 +22,12 @@ AC_SUBST([PATCHLEVEL_VERSION], [V_PATCH]) # 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. -AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0]) +m4_define([UST_LIB_V_MAJOR], [1]) +m4_define([UST_LIB_V_MINOR], [0]) +m4_define([UST_LIB_V_PATCH], [0]) + +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. @@ -28,7 +35,7 @@ AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0]) # liblttng-ust, lttng-sessiond, and lttng-consumerd. AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [4:0:0]) -AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h]) +AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h]) AC_CONFIG_AUX_DIR([config]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([include/lttng/tracepoint.h]) @@ -36,21 +43,21 @@ AC_CONFIG_SRCDIR([include/lttng/tracepoint.h]) AC_CANONICAL_TARGET AC_CANONICAL_HOST -AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip tar-ustar]) +AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc -Wall -Wno-portability -Werror]) 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]) +# Enable silent rules by default +AM_SILENT_RULES([yes]) # Checks for C compiler AC_USE_SYSTEM_EXTENSIONS AC_SYS_LARGEFILE AC_PROG_CC -AC_PROG_CC_STDC +# 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 -rw_PROG_CXX_WORKS +AX_CXX_COMPILE_STDCXX([11]) +RW_PROG_CXX_WORKS AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) # Check if the compiler support weak symbols @@ -61,6 +68,7 @@ AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [ ]) # Checks for programs. +AM_PROG_AR AC_PROG_SED AC_PROG_GREP AC_PROG_LN_S @@ -125,6 +133,8 @@ AS_IF([test "x$ax_cv___attribute__" = "xyes"], [:], [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])]) +AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])]) + # Checks for library functions. AC_FUNC_CHOWN AC_FUNC_FORK @@ -151,9 +161,13 @@ AC_CHECK_FUNCS([ \ strdup \ strerror \ strtol \ + strtoul \ sysconf \ ]) +# Check for pthread_setname_np and its signature +LTTNG_PTHREAD_SETNAME_NP + # AC_FUNC_MALLOC causes problems when cross-compiling. #AC_FUNC_MALLOC @@ -171,6 +185,35 @@ AC_CHECK_HEADERS([ \ wchar.h \ ]) +# Set architecture specific options +AS_CASE([$host_cpu], + [i[[3456]]86], [], + [x86_64], [], + [amd64], [], + [powerpc], [], + [ppc64], [], + [ppc64le], [], + [powerpc64], [], + [powerpc64le], [], + [s390], [NO_UNALIGNED_ACCESS=1], + [s390x], [NO_UNALIGNED_ACCESS=1], + [arm*], [ + NO_UNALIGNED_ACCESS=1 + NO_NUMA=1 + ], + [aarch64*], [NO_UNALIGNED_ACCESS=1], + [mips*], [NO_UNALIGNED_ACCESS=1], + [tile*], [NO_UNALIGNED_ACCESS=1], + [ + UNSUPPORTED_ARCH=1 + NO_UNALIGNED_ACCESS=1 + ]) + +# Set os specific options +AS_CASE([$host_os], + [freebsd*], [NO_NUMA=1] +) + # 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]) @@ -178,17 +221,18 @@ AH_TEMPLATE([LTTNG_UST_HAVE_PERF_EVENT], [Perf event integration via perf_event. # Checks for libraries. AC_CHECK_LIB([dl], [dlopen], [ - have_libdl=yes libdl_name=dl + DL_LIBS="-ldl" ], [ #libdl not found, check for dlopen in libc. AC_CHECK_LIB([c], [dlopen], [ - have_libc_dl=yes libdl_name=c + DL_LIBS="-lc" ], [ AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.]) ]) ]) +AC_SUBST(DL_LIBS) # Check if libdl has dlmopen support. AH_TEMPLATE([HAVE_DLMOPEN], ["Define to 1 if dlmopen is available."]) @@ -196,21 +240,10 @@ AC_CHECK_LIB([$libdl_name], [dlmopen], [AC_DEFINE([HAVE_DLMOPEN], [1])] ) -AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"]) -AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"]) - -AC_CHECK_LIB([pthread], [pthread_create]) -AC_CHECK_LIB([pthread], [pthread_setname_np], - AC_DEFINE([HAVE_PTHREAD_SETNAME_NP], [1], [Define to 1 if pthread_setname_np is available.]), - AC_CHECK_LIB([pthread], [pthread_set_name_np], - AC_DEFINE([HAVE_PTHREAD_SET_NAME_NP], [1], [Define to 1 if pthread_set_name_np is available.]), - AC_MSG_RESULT([pthread setname/set_name not found.]))) - # Check for dlfcn.h AC_CHECK_HEADER([dlfcn.h]) AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], [ AC_CHECK_DECLS([RTLD_DI_LINKMAP], [], [], [ - #define _GNU_SOURCE /* Required on Linux to get GNU extensions */ #include ]) ], [ @@ -219,35 +252,14 @@ AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], [ AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"]) -# URCU - -# urcu - check if we just find the headers it out of the box. -AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CPPFLAGS]=-Idir to specify their location. -This error can also occur when the liburcu package's configure script has not been run.])]) - -# URCU library version needed or newer -m4_define([WRONG_LIBURCU_MSG], [Userspace RCU (liburcu) >= 0.11.0 is needed]) - -#Macro added in urcu 0.6.6 -AC_CHECK_DECL([caa_likely], [], - [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]]) -#Macro added in urcu 0.11.0 -AC_CHECK_DECL([DEFINE_URCU_TLS_IE], [], - [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include ]] -) - -# urcu-cds - check that URCU Concurrent Data Structure lib is available to compilation -# Part of Userspace RCU library 0.7.2 or better. -AC_CHECK_LIB([urcu-cds], [_cds_lfht_new], [], [AC_MSG_ERROR([Cannot find -liburcu-cds lib, part of Userspace RCU 0.7 or better. Use [LDFLAGS]=-Ldir to specify its location.])]) - -# urcu - check that URCU lib is available to compilation -AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])]) - -# urcu - check that URCU lib is at least version 0.6 -AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])]) +# Require URCU >= 0.12 for DEFINE_URCU_TLS_INIT +PKG_CHECK_MODULES([URCU], [liburcu >= 0.12]) # numa.h integration +AS_IF([test "x$NO_NUMA" = "x1"],[ + AS_IF([test "x$enable_numa" = "x" ], [enable_numa=no]) +]) + AC_ARG_ENABLE([numa], [ AS_HELP_STRING([--disable-numa], [disable NUMA support]) ], [ @@ -258,7 +270,8 @@ AS_HELP_STRING([--disable-numa], [disable NUMA support]) AS_IF([test "x$enable_numa" = "xyes"], [ # numa - check that numa lib is available - AC_CHECK_LIB([numa], [numa_available], [], [AC_MSG_ERROR([libnuma is required, please install it (e.g. libnuma-dev) or use [LDFLAGS]=-Ldir to specify the right location.])]) + AC_CHECK_LIB([numa], [numa_available], [], +[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"]) @@ -274,28 +287,6 @@ AS_IF([test "x$have_perf_event" = "xyes"], [ AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1]) ]) -AC_MSG_CHECKING([host system alignment requirements]) -AS_CASE([$host_cpu], - [i[[3456]]86], [], - [x86_64], [], - [amd64], [], - [powerpc], [], - [ppc64], [], - [ppc64le], [], - [powerpc64], [], - [powerpc64le], [], - [s390], [NO_UNALIGNED_ACCESS=1], - [s390x], [NO_UNALIGNED_ACCESS=1], - [arm*], [NO_UNALIGNED_ACCESS=1], - [aarch64*], [NO_UNALIGNED_ACCESS=1], - [mips*], [NO_UNALIGNED_ACCESS=1], - [tile*], [NO_UNALIGNED_ACCESS=1], - [ - UNSUPPORTED_ARCH=1 - NO_UNALIGNED_ACCESS=1 - ]) -AC_MSG_RESULT([$host_cpu]) - AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [ AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) ]) @@ -344,6 +335,7 @@ AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || te AX_PROG_JAVAC AX_PROG_JAVA AX_PROG_JAR + AC_ARG_VAR([CLASSPATH], [Java class path]) AX_JNI_INCLUDE_DIR for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS @@ -357,6 +349,8 @@ AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || te CPPFLAGS="$saved_CPPFLAGS" ]) +AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"]) + AS_IF([test "x$java_agent_log4j" = "xyes"], [ AX_CHECK_CLASSPATH AX_CHECK_CLASS([org.apache.log4j.Logger]) @@ -416,6 +410,19 @@ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES], [python], ["yes"]) AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"]) +# Enable building examples +AC_ARG_ENABLE( + examples, + AS_HELP_STRING( + [--disable-examples], + [Do not build and install examples] + ), + [enable_examples=$enableval], + [enable_examples=yes] +) + +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]) @@ -476,8 +483,18 @@ AC_DEFUN([_AC_DEFINE_AND_SUBST], [ _AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000]) -AM_CFLAGS="-Wall" +AM_CFLAGS="-Wall $URCU_CFLAGS $PTHREAD_CFLAGS" AC_SUBST(AM_CFLAGS) + +AM_CXXFLAGS="$AM_CFLAGS" +AC_SUBST(AM_CXXFLAGS) + +# The order in which the include folders are searched is important. +# The top_builddir should always be searched first in the event that a build +# time generated file is included. +AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h" +AC_SUBST(AM_CPPFLAGS) + AC_SUBST(JNI_CPPFLAGS) AC_CONFIG_FILES([ @@ -488,6 +505,8 @@ AC_CONFIG_FILES([ include/Makefile include/lttng/ust-version.h snprintf/Makefile + libcounter/Makefile + libmsgpack/Makefile libringbuffer/Makefile liblttng-ust-comm/Makefile liblttng-ust/Makefile @@ -514,27 +533,37 @@ AC_CONFIG_FILES([ python-lttngust/lttngust/__init__.py tools/Makefile tests/Makefile - tests/ctf-types/Makefile - tests/hello/Makefile - tests/hello.cxx/Makefile - tests/same_line_tracepoint/Makefile - tests/snprintf/Makefile - tests/ust-elf/Makefile + tests/compile/Makefile + tests/compile/ctf-types/Makefile + tests/compile/hello.cxx/Makefile + tests/compile/hello/Makefile + tests/compile/hello-many/Makefile + tests/compile/same_line_tracepoint/Makefile + tests/compile/test-app-ctx/Makefile tests/benchmark/Makefile + tests/unit/gcc-weak-hidden/Makefile + tests/unit/libmsgpack/Makefile + tests/unit/Makefile + tests/unit/libringbuffer/Makefile + tests/unit/pthread_name/Makefile + tests/unit/snprintf/Makefile + tests/unit/ust-elf/Makefile tests/utils/Makefile - tests/test-app-ctx/Makefile - tests/gcc-weak-hidden/Makefile lttng-ust.pc + lttng-ust-ctl.pc ]) # Create link for python agent for the VPATH guru. AC_CONFIG_LINKS([ python-lttngust/lttngust/agent.py:python-lttngust/lttngust/agent.py python-lttngust/lttngust/cmd.py:python-lttngust/lttngust/cmd.py + python-lttngust/lttngust/compat.py:python-lttngust/lttngust/compat.py python-lttngust/lttngust/debug.py:python-lttngust/lttngust/debug.py python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py ]) +AC_CONFIG_FILES([tests/unit/ust-elf/test_ust_elf],[chmod +x tests/unit/ust-elf/test_ust_elf]) + AC_OUTPUT @@ -583,12 +612,18 @@ PPRINT_PROP_BOOL_CUSTOM([JNI interface (JNI)], $value, [use --enable-jni-interfa test "x$python_agent" = xyes && value=1 || value=0 PPRINT_PROP_BOOL_CUSTOM([Python agent], $value, [use --enable-python-agent]) +test "x$have_perf_event" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL_CUSTOM([Perf event integration], $value) + test "x$enable_numa" = xyes && value=1 || value=0 PPRINT_PROP_BOOL([NUMA], $value) AS_ECHO PPRINT_SET_INDENT(0) +test "x$enable_examples" = xyes && value=1 || value=0 +PPRINT_PROP_BOOL([Build and install examples], $value, $PPRINT_COLOR_SUBTITLE) + # man pages build enabled/disabled m4_pushdef([build_man_pages_msg], [Build and install man pages])