ust-fd: Add close_range declaration

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index e7b8358143e29808df4ed7b7907578fb7baf9da1..05c343b7aeb7114f1830bd88b23b701ac43af27c 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,701 +1,807 @@
-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.59)
-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], [14])
+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], [[O-Beer]])
+m4_define([ust_version_description], [[An alcoholic drink made from yeast-fermented malt flavored with hops.]])
+
+# 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
 # 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], [0])
-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.

 
 

-# 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], [4:0:0])
+##                     ##
+## Autoconf base setup ##
+##                     ##

 
 

-AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h])
+AC_PREREQ([2.69])
+AC_INIT([lttng-ust],[ust_version],[mathieu dot desnoyers at efficios dot com],[],[https://lttng.org])
+
+AC_CONFIG_HEADERS([src/common/config.h include/lttng/ust-config.h include/lttng/ust-version.h])

 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR([config])
 AC_CONFIG_MACRO_DIR([m4])

-AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])

 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 

-AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc])
+
+##                     ##
+## 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])
 
 AM_MAINTAINER_MODE([enable])
 

-# Enable silent rules if available (Introduced in AM 1.11)
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+# Enable silent rules by default
+AM_SILENT_RULES([yes])

 
 

-AC_REQUIRE_AUX_FILE([tap-driver.sh])

 
 

-# Checks for C compiler
-AC_USE_SYSTEM_EXTENSIONS
-AC_SYS_LARGEFILE
-AC_PROG_CC
-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"])
+##                               ##
+## OS and Arch specific defaults ##
+##                               ##

 
 

-# Check if the compiler support weak symbols
-AX_SYS_WEAK_ALIAS
+# Set os specific options
+AS_CASE([$host_os],
+  [freebsd*], [AE_FEATURE_DISABLE([numa])]
+)

 
 

-AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [
-       AC_MSG_ERROR([Your platform doesn't support weak symbols.])
-])
+# Set architecture specific options
+AS_CASE([$host_cpu],
+  [i[[3456]]86], [],
+  [x86_64], [],
+  [amd64], [],
+  [powerpc], [],
+  [ppc64], [],
+  [ppc64le], [],
+  [powerpc64], [],
+  [powerpc64le], [],
+  [s390], [],
+  [s390x], [],
+  [arm*], [AE_FEATURE_DISABLE([numa])],
+  [aarch64*], [],
+  [mips*], [],
+  [tile*], [],
+  [
+    unsupported_arch="yes"
+  ])
+
+
+##                   ##
+## C compiler checks ##
+##                   ##
+
+# Choose the C compiler
+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])

 
 

-# Checks for programs.
-AM_PROG_AR
-AC_PROG_SED
-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"])
+# Make sure the C compiler supports C99
+AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([The compiler does not support C99])])

 
 

-# libtool link_all_deplibs fixup. See http://bugs.lttng.org/issues/321.
-AC_ARG_ENABLE([libtool-linkdep-fixup], [
-AS_HELP_STRING([--disable-libtool-linkdep-fixup], [disable the libtool fixup for linking all dependent libraries (link_all_deplibs)])
-], [
-       libtool_fixup=$enableval
-], [
-       libtool_fixup=yes
-])
+# Enable available system extensions and LFS support
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE

 
 

-AS_IF([test "x$libtool_fixup" = "xyes"], [
-       libtool_m4="$srcdir/m4/libtool.m4"
-       libtool_flag_pattern=".*link_all_deplibs\s*,\s*\$1\s*)"
-       AC_MSG_CHECKING([for occurence(s) of link_all_deplibs = no in $libtool_m4])
-       libtool_flag_pattern_count=$(grep -c "$libtool_flag_pattern\s*=\s*no" $libtool_m4)
-
-       AS_IF([test $libtool_flag_pattern_count -ne 0], [
-       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
-       ], [
-               AC_MSG_RESULT([none])
-       ])
-])
-LT_INIT([disable-static])
+# Make sure the C compiler supports __attribute__
+AX_C___ATTRIBUTE__
+AS_IF([test "x$ax_cv___attribute__" != "xyes"],
+  [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])

 
 

-AC_MSG_CHECKING([whether shared libraries are enabled])
-AS_IF([test "x$enable_shared" = "xyes"], [
-       AC_MSG_RESULT([yes])
-], [
-       AC_MSG_RESULT([no])
-       AC_MSG_ERROR([LTTng-UST requires shared libraries to be enabled])
-])
+# Make sure we have pthread support
+AX_PTHREAD([], [AC_MSG_ERROR([Could not configure pthread support])])
+
+# Make sure the C compiler supports weak symbols
+AX_SYS_WEAK_ALIAS
+AS_IF([test "x$ax_cv_sys_weak_alias" = "xno"],
+  [AC_MSG_ERROR([Your platform doesn't support weak symbols.])])

 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE
 
 # Checks for typedefs, structures, and compiler characteristics.
 AC_C_INLINE

-AC_TYPE_INT8_T
+AC_C_TYPEOF

 AC_TYPE_INT16_T
 AC_TYPE_INT32_T
 AC_TYPE_INT64_T
 AC_TYPE_INT16_T
 AC_TYPE_INT32_T
 AC_TYPE_INT64_T

+AC_TYPE_INT8_T

 AC_TYPE_MODE_T
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UID_T
 AC_TYPE_MODE_T
 AC_TYPE_OFF_T
 AC_TYPE_PID_T
 AC_TYPE_SIZE_T
 AC_TYPE_SSIZE_T
 AC_TYPE_UID_T

-AC_TYPE_UINT8_T

 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T
 AC_TYPE_UINT16_T
 AC_TYPE_UINT32_T
 AC_TYPE_UINT64_T

+AC_TYPE_UINT8_T

 AC_CHECK_TYPES([ptrdiff_t])
 
 AC_CHECK_TYPES([ptrdiff_t])
 

-AX_C___ATTRIBUTE__
-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
-AC_FUNC_MMAP
-AC_FUNC_REALLOC
-AC_FUNC_STRERROR_R
-AC_FUNC_STRNLEN
-AC_CHECK_FUNCS([ \
-       atexit \
-       clock_gettime \
-       ftruncate \
-       getpagesize \
-       gettimeofday \
-       localeconv \
-       memchr \
-       memmove \
-       memset \
-       mkdir \
-       munmap \
-       realpath \
-       sched_getcpu \
-       socket \
-       strchr \
-       strdup \
-       strerror \
-       strtol \
-       sysconf \
+# Detect warning flags supported by the C compiler and append them to
+# WARN_CFLAGS.
+m4_define([WARN_FLAGS_LIST], [ dnl
+  -Wall dnl
+  -Wextra dnl
+  -Wmissing-prototypes dnl
+  -Wmissing-declarations dnl
+  -Wnull-dereference dnl
+  -Wundef dnl
+  -Wshadow dnl
+  -Wjump-misses-init dnl
+  -Wsuggest-attribute=format dnl
+  -Wtautological-constant-out-of-range-compare dnl
+  -Wnested-externs dnl
+  -Wwrite-strings dnl
+  -Wformat=2 dnl
+  -Wstrict-aliasing dnl
+  -Wmissing-noreturn dnl
+  -Winit-self dnl
+  -Wduplicated-cond dnl
+  -Wduplicated-branches dnl
+  -Wlogical-op dnl
+  dnl These would require reworking the tracepoint macros
+  dnl-Wredundant-decls dnl
+  -Wno-sign-compare dnl
+  -Wno-missing-field-initializers dnl
+  -Wno-null-dereference dnl
+  -Wno-gnu dnl Disable warnings for GNU extensions on Clang

 ])
 
 ])
 

-# Check for pthread_setname_np and its signature
-LTTNG_PTHREAD_SETNAME_NP
+# Pass -Werror as an extra flag during the test: this is needed to make the
+# -Wunknown-warning-option diagnostic fatal with clang.
+AC_LANG_PUSH([C])
+AX_APPEND_COMPILE_FLAGS([WARN_FLAGS_LIST], [WARN_CFLAGS], [-Werror])
+AC_LANG_POP([C])

 
 

-# AC_FUNC_MALLOC causes problems when cross-compiling.
-#AC_FUNC_MALLOC
+# The test used in AX_APPEND_COMPILE_FLAGS, generated using AC_LANG_PROGRAM, is
+# written in such a way that it triggers warnings with the following warning
+# flags.  So they would always end up disabled if we put them there, because
+# the test program would not build.
+#
+# Enable them here unconditionally.  They are supported by GCC >= 4.8 and by
+# Clang >= 3.3 (required by the project) and are only valid for C code.
+WARN_CFLAGS="${WARN_CFLAGS} -Wold-style-definition -Wstrict-prototypes"

 
 

-# Checks for header files.
-AC_HEADER_STDBOOL
-AC_CHECK_HEADERS([ \
-       arpa/inet.h \
-       fcntl.h \
-       float.h \
-       limits.h \
-       locale.h \
-       stddef.h \
-       sys/socket.h \
-       sys/time.h \
-       wchar.h \
-])
+# Disable 'strict aliasing' if the compiler supports it.
+AC_LANG_PUSH([C])
+AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing], [OPT_CFLAGS], [-Werror])
+AC_LANG_POP([C])

 
 

-# 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]
-)
+##                     ##
+## C++ compiler checks ##
+##                     ##

 
 

-# 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])
-AH_TEMPLATE([LTTNG_UST_HAVE_PERF_EVENT], [Perf event integration via perf_event.h])
+# Find an optional C++11 compiler without GNU extensions (-std=c++11)
+AX_CXX_COMPILE_STDCXX([11], [noext], [optional])

 
 

-# Checks for libraries.
-AC_CHECK_LIB([dl], [dlopen], [
-       libdl_name=dl
-       DL_LIBS="-ldl"
-], [
-       #libdl not found, check for dlopen in libc.
-       AC_CHECK_LIB([c], [dlopen], [
-               libdl_name=c
-               DL_LIBS="-lc"
-       ], [
-               AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.])
-       ])
+AS_IF([test "$HAVE_CXX11" = "1"], [
+  # Pass -Werror as an extra flag during the test: this is needed to make the
+  # -Wunknown-warning-option diagnostic fatal with clang.
+  AC_LANG_PUSH([C++])
+  AX_APPEND_COMPILE_FLAGS([WARN_FLAGS_LIST -Wno-undef -Wno-duplicated-branches], [WARN_CXXFLAGS], [-Werror])
+  AC_LANG_POP([C++])

 ])
 ])

-AC_SUBST(DL_LIBS)

 
 

-# Check if libdl has dlmopen support.
-AH_TEMPLATE([HAVE_DLMOPEN], ["Define to 1 if dlmopen is available."])
-AC_CHECK_LIB([$libdl_name], [dlmopen],
-       [AC_DEFINE([HAVE_DLMOPEN], [1])]
-)

 
 

-# 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 <dlfcn.h>
-       ])
-], [
-       ac_cv_have_decl_RTLD_DI_LINKMAP="no"
+##               ##
+## Header checks ##
+##               ##
+
+AC_HEADER_STDBOOL
+AC_CHECK_HEADERS([ \
+  arpa/inet.h \
+  dlfcn.h \
+  fcntl.h \
+  float.h \
+  limits.h \
+  linux/perf_event.h \
+  locale.h \
+  stddef.h \
+  sys/socket.h \
+  sys/time.h \
+  wchar.h \

 ])
 
 ])
 

-AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"])
+# Check for dlinfo() by testing for RTLD_DI_LINKMAP in dlfcn.h
+AS_IF([test "x$ac_cv_header_dlfcn_h" = "xyes"], [
+  AC_CHECK_DECL([RTLD_DI_LINKMAP], [], [], [[#include <dlfcn.h>]])
+])

 
 

-# URCU

 
 

-AC_MSG_CHECKING([DEFINE_URCU_TLS_INIT()])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-       #include <urcu/tls-compat.h>
-       DEFINE_URCU_TLS_INIT(int, a, 1);
-]])], [
-       AC_MSG_RESULT([yes])
-], [
-       AC_MSG_RESULT([no])
-       AC_MSG_ERROR([Please upgrade your version of liburcu to 0.12.0 or better])
-])
+##                 ##
+## Programs checks ##
+##                 ##

 
 

-# 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-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.])])
-
-AC_MSG_CHECKING([caa_likely()])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-       #include <urcu/compiler.h>
-       void fct(void)
-       {
-               if (caa_likely(1)) {
-               }
-       }
-]])], [
-       AC_MSG_RESULT([yes])
-], [
-       AC_MSG_RESULT([no])
-       AC_MSG_ERROR([Please upgrade your version of liburcu to 0.6.6 or better])
-])
+AM_PROG_AR
+AC_PROG_SED
+AC_PROG_GREP
+AC_PROG_LN_S
+AC_PROG_MKDIR_P
+AC_PROG_MAKE_SET
+AC_CHECK_PROGS([ASCIIDOC], [asciidoc])
+AC_CHECK_PROGS([CMAKE], [cmake])
+AC_CHECK_PROGS([FOLD], [fold])
+AC_CHECK_PROGS([XMLTO], [xmlto])

 
 

-# urcu - check that URCU lib is available to compilation
-AC_CHECK_LIB([urcu-bp], [urcu_bp_synchronize_rcu], [], [AC_MSG_ERROR([Cannot find liburcu-bp 0.11 or newer. Use [LDFLAGS]=-Ldir to specify its location.])])
+AM_PATH_PYTHON([2.7], [], [PYTHON=""])

 
 

-# urcu - check that URCU lib is at least version 0.11
-AC_CHECK_LIB([urcu-bp], [urcu_bp_call_rcu], [], [AC_MSG_ERROR([liburcu 0.11 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])])
+# Initialize and configure libtool
+LT_INIT([disable-static])

 
 

-# 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])
-], [
-       enable_numa=$enableval
-], [
-       enable_numa=yes
-])
+##                ##
+## Library checks ##
+##                ##

 
 

-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 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
+AC_FUNC_CHOWN
+AC_FUNC_FORK
+AC_FUNC_MMAP
+AC_FUNC_STRERROR_R
+AC_FUNC_STRNLEN
+AC_CHECK_FUNCS([ \
+  atexit \
+  clock_gettime \
+  ftruncate \
+  getpagesize \
+  gettid \
+  gettimeofday \
+  localeconv \
+  memchr \
+  memmove \
+  memset \
+  mkdir \
+  munmap \
+  realpath \
+  sched_getcpu \
+  socket \
+  strchr \
+  strdup \
+  strerror \
+  strtol \
+  strtoul \
+  sysconf \

 ])
 ])

-AM_CONDITIONAL([HAVE_LIBNUMA], [test "x$have_libnuma" = "xyes"])

 
 

-# optional linux/perf_event.h
-AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes], [])
+# AC_FUNC_MALLOC causes problems when cross-compiling.
+#AC_FUNC_MALLOC
+#AC_FUNC_REALLOC

 
 

-# Perf event counters are supported on all architectures supported by
-# perf, using the read system call as fallback.
-AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$have_perf_event" = "xyes"])
+# Check for pthread_setname_np and its signature
+AE_PTHREAD_SETNAME_NP
+AE_PTHREAD_GETNAME_NP

 
 

-AS_IF([test "x$have_perf_event" = "xyes"], [
-       AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1])
+# Check dor dlopen() in -ldl or -lc
+AC_CHECK_LIB([dl], [dlopen], [
+  libdl_name=dl
+  DL_LIBS="-ldl"
+], [
+  # dlopen not found in libdl, check in libc
+  AC_CHECK_LIB([c], [dlopen], [
+    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)

 
 

-AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [
-       AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
+# Check if libdl has dlmopen()
+AC_CHECK_LIB([$libdl_name], [dlmopen], [
+  AC_DEFINE([HAVE_DLMOPEN], [1], [Define to 1 if dlmopen is available.])

 ])
 
 ])
 

-# 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]])
+# Require URCU >= 0.12 for DEFINE_URCU_TLS_INIT
+PKG_CHECK_MODULES([URCU], [liburcu >= 0.12])
+
+
+##                 ##
+## User variables  ##
+##                 ##
+
+# Additional variables captured during ./configure
+
+AC_ARG_VAR([CLASSPATH], [Java class path])
+AC_ARG_VAR([JAVACFLAGS], [Java compiler flags])
+AC_ARG_VAR([JAVAC], [Java compiler])
+AC_ARG_VAR([JAVAFLAGS], [Java VM flags])
+AC_ARG_VAR([JAVA], [Java VM])
+AC_ARG_VAR([JAVAPREFIX], [prefix where Java runtime is installed])
+
+
+##                              ##
+## Optional features selection ##
+##                              ##
+
+# numa integration
+# Enabled by default, except on some platforms
+AE_FEATURE_DEFAULT_ENABLE
+AE_FEATURE([numa],[disable NUMA support])
+
+# Java JNI interface library
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([jni-interface], [build JNI interface between C and Java])
+
+# Build the Java Logging API agent
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([java-agent-jul],[build the LTTng UST Java agent with JUL support])
+
+# Build the Java Log4j 1.x agent
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([java-agent-log4j],[build the LTTng UST Java agent with Log4j 1.x support (deprecated)])
+
+# Build the Java Log4j 2.x agent
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([java-agent-log4j2],[build the LTTng UST Java agent with Log4j 2.x support])
+
+# Build both Java agents
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([java-agent-all],[build the LTTng UST Java agent with all supported backends])
+
+# Build the Python agent
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([python-agent],[build the LTTng UST Python agent])
+
+# Build the examples
+# Disabled by default
+AE_FEATURE_DEFAULT_ENABLE
+AE_FEATURE([examples],[Do not build and install examples])
+
+# Man pages
+# Enabled by default
+AE_FEATURE_DEFAULT_ENABLE
+AE_FEATURE([man-pages],[Do not build and install man pages (already built in a distributed tarball)])
+
+# Systemtap sdt.h integration
+# Disabled by default
+AC_ARG_WITH([sdt],
+  [AS_HELP_STRING([--with-sdt], [provide SystemTap integration via sdt.h [default=no]])]
+)
+
+# Override the default runtime directory
+AC_ARG_WITH([lttng-system-rundir], [
+AS_HELP_STRING([--with-lttng-system-rundir], [Location of the system directory where LTTng-UST expects the system-wide lttng-sessiond runtime files. The default is "/var/run/lttng".]),

 ], [
 ], [

-       jni_interface=$enableval
+  lttng_system_rundir="$withval"

 ], [
 ], [

-       jni_interface=no
+  lttng_system_rundir="/var/run/lttng"

 ])
 
 ])
 

-AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])

 
 

+##                                          ##
+## Check for conflicting features selection ##
+##                                          ##

 
 

-AC_ARG_ENABLE([java-agent-jul], [
-AS_HELP_STRING([--enable-java-agent-jul], [build the LTTng UST Java agent with JUL support [default=no]])
-], [
-       java_agent_jul=$enableval
-], [
-       java_agent_jul=no
+AE_IF_FEATURE_DISABLED([shared], [
+  AC_MSG_ERROR(LTTng-UST requires shared libraries to be enabled)

 ])
 
 ])
 

-AC_ARG_ENABLE([java-agent-log4j], [
-AS_HELP_STRING([--enable-java-agent-log4j], [build the LTTng UST Java agent with Log4j support [default=no]])
-], [
-       java_agent_log4j=$enableval
-], [
-       java_agent_log4j=no
+AE_IF_FEATURE_ENABLED([static], [
+  AC_MSG_ERROR(Static linking LTTng-UST is currently unsupported)

 ])
 
 ])
 

-AC_ARG_ENABLE([java-agent-all], [
-AS_HELP_STRING([--enable-java-agent-all], [build the LTTng UST Java agent with all supported backends [default=no]])
-], [
-       java_agent_jul=$enableval
-       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"])
-
-AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"], [
-       AX_JAVA_OPTIONS
-       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
-       do
-               JNI_CPPFLAGS="$JNI_CPPFLAGS -I$JNI_INCLUDE_DIR"
-       done
-
-       saved_CPPFLAGS="$CPPFLAGS"
-       CPPFLAGS="$CPPFLAGS $JNI_CPPFLAGS"
-       AX_PROG_JAVAH
-       CPPFLAGS="$saved_CPPFLAGS"
+AE_IF_FEATURE_ENABLED([java-agent-all], [
+  AE_FEATURE_ENABLE([java-agent-jul])
+  AE_FEATURE_ENABLE([java-agent-log4j])
+  AE_FEATURE_ENABLE([java-agent-log4j2])

 ])
 
 ])
 

-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])
-       AS_IF([test "x$ac_cv_class_org_apache_log4j_Logger" = "xno"], [
-               AC_MSG_ERROR([The UST Java agent support for log4j was requested but the Log4j classes were not found. Please specify the location of the Log4j jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/log4j.jar"])
-       ])
+##                                          ##
+## Check for optional features dependencies ##
+##                                          ##
+
+# The numa integration requires libnuma
+AE_IF_FEATURE_ENABLED([numa], [
+  AC_CHECK_LIB([numa], [numa_available], [
+    AC_DEFINE([HAVE_LIBNUMA], [1], [Define to 1 if libnuma is available.])
+  ], [
+    AC_MSG_ERROR([dnl
+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.
+    ])
+  ])

 ])
 
 ])
 

-# Option to build the python agent
-AC_ARG_ENABLE([python-agent], [
-AS_HELP_STRING([--enable-python-agent], [build the LTTng UST Python agent [default=no]])
-], [
-       python_agent=$enableval
-], [:])
-AM_CONDITIONAL([BUILD_PYTHON_AGENT], [test "x$python_agent" = "xyes"])
-AS_IF([test "x$python_agent" = "xyes"], [
-       AM_PATH_PYTHON([2.7])
+# The JNI interface and Java Agents require a working Java JDK
+AS_IF([AE_IS_FEATURE_ENABLED([jni-interface]) || AE_IS_FEATURE_ENABLED([java-agent-jul]) || \
+    AE_IS_FEATURE_ENABLED([java-agent-log4j]) || AE_IS_FEATURE_ENABLED([java-agent-log4j2])], [
+  AX_PROG_JAVAC
+  AX_PROG_JAVA
+  AX_PROG_JAR
+
+  # Get the CPPFLAGS required to build jni libraries
+  AX_JNI_INCLUDE_DIR
+  for jni_include_dir in $JNI_INCLUDE_DIRS; do
+    JNI_CPPFLAGS="$JNI_CPPFLAGS -I$jni_include_dir"
+  done
+
+  # Check for javah and jni.h
+  saved_CPPFLAGS="$CPPFLAGS"
+  CPPFLAGS="$CPPFLAGS $JNI_CPPFLAGS"
+  AX_PROG_JAVAH
+  CPPFLAGS="$saved_CPPFLAGS"

 ])
 
 ])
 

-# sdt.h integration
-AC_ARG_WITH([sdt], [
-AS_HELP_STRING([--with-sdt], [provide SystemTap integration via sdt.h [default=no]])
-], [
-       with_sdt=$withval
-], [
-       with_sdt="no"
+# The log4j 1.x agent requires the log4j jar in the classpath
+AE_IF_FEATURE_ENABLED([java-agent-log4j], [
+  AX_CHECK_CLASS([org.apache.log4j.Logger])
+  AS_IF([test "x$ac_cv_class_org_apache_log4j_Logger" = "xno"], [
+    AC_MSG_ERROR([dnl
+The UST Java agent support for log4j was requested but the Log4j classes were
+not found. Please specify the location of the Log4j jar via the Java CLASSPATH
+environment variable, e.g. ./configure CLASSPATH="/path/to/log4j.jar"
+
+Current CLASSPATH: "$CLASSPATH"
+    ])
+  ])

 ])
 
 ])
 

-AS_IF([test "x$with_sdt" = "xyes"], [
-       AC_MSG_CHECKING([STAP_PROBEV()])
-       AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-               #define SDT_USE_VARIADIC
-               #include <sys/sdt.h>
-               void fct(void)
-               {
-                       STAP_PROBEV(provider,name,1,2,3,4,5,6,7,8,9,10);
-               }
-       ]])], [
-               AC_MSG_RESULT([yes])
-               AC_DEFINE([LTTNG_UST_HAVE_SDT_INTEGRATION], [1])
-       ], [
-               AC_MSG_RESULT([no])
-               AC_MSG_ERROR([The sdt.h integration was requested but the STAP_PROBEV define cannot be used. Make sure it is installed, and up to date, or use CPPFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h])
-       ])
+# The log4j 2.x agent requires the log4j core and api jars in the classpath
+AE_IF_FEATURE_ENABLED([java-agent-log4j2], [
+  AX_CHECK_CLASS([org.apache.logging.log4j.Logger])
+  AX_CHECK_CLASS([org.apache.logging.log4j.core.Core])
+  AS_IF([test "x$ac_cv_class_org_apache_logging_log4j_Logger" = "xno" || test "x$ac_cv_class_org_apache_logging_log4j_core_Core" = "xno"], [
+    AC_MSG_ERROR([dnl
+The UST Java agent support for log4j was requested but the Log4j classes were
+not found. Please specify the location of the Log4j API and core 2.x jars via the Java CLASSPATH
+environment variable, e.g. ./configure CLASSPATH="/path/to/log4j-core.jar:/path/to/log4j-api.jar"
+
+Current CLASSPATH: "$CLASSPATH"
+    ])
+  ])

 ])
 
 ])
 

-AC_ARG_WITH([lttng-system-rundir], [
-AS_HELP_STRING([--with-lttng-system-rundir], [Location of the system directory where LTTng-UST expects the system-wide lttng-sessiond runtime files. The default is "/var/run/lttng".]),
-], [
-       lttng_system_rundir="$withval"
-], [
-       lttng_system_rundir="/var/run/lttng"
+# The python agent requires a python interpreter
+AE_IF_FEATURE_ENABLED([python-agent], [
+  AS_IF([test "x$PYTHON" = "x"], [
+    AC_MSG_ERROR([dnl
+Cannot find a suitable python interpreter. You can override it with the PYTHON
+environment variable.
+    ])
+  ])
+
+  AX_COMPARE_VERSION(["$PYTHON_VERSION"], [ge], ["3.12"], [
+    have_python_312_or_greater=yes
+    AC_MSG_CHECKING([for python setuptools])
+    AS_IF(["$PYTHON" -c "import setuptools" 2>/dev/null], [
+      AC_MSG_RESULT([yes])
+    ], [
+      AC_MSG_RESULT([no])
+      AC_MSG_ERROR([Python >= 3.12 removed 'distutils', the 'setuptools' module needs to be installed for the selected interpreter.])
+    ])
+  ])

 ])
 ])

-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"])
-
-# 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])
-AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"])
-
-# Enable building man pages (user's intention).
-AC_ARG_ENABLE(
-       man-pages,
-       AS_HELP_STRING(
-               [--disable-man-pages],
-               [Do not build and install man pages (already built in a distributed tarball)]
-       ),
-       [man_pages_opt=$enableval],
-       [man_pages_opt=yes]
-)

 
 # Check for asciidoc and xmlto if we enabled building the man pages.
 
 # Check for asciidoc and xmlto if we enabled building the man pages.

-have_asciidoc_xmlto=no
-warn_prebuilt_man_pages=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"], [
-               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([
+AE_IF_FEATURE_ENABLED([man-pages], [
+  AS_IF([test "x$ASCIIDOC" = "x" || test "x$XMLTO" = "x"], [
+    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
+      # to build the man pages.
+      AC_MSG_ERROR([dnl

 Both asciidoc and xmlto are needed to build the LTTng-UST man pages. Use
 --disable-man-pages to disable building the man pages, in which case
 they will not be installed.
 Both asciidoc and xmlto are needed to build the LTTng-UST 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.
-                       warn_prebuilt_man_pages=yes
-               ])
-       ], [
-               have_asciidoc_xmlto=yes
-       ])
+      ])
+    ], [
+      # 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.
+      warn_prebuilt_man_pages=yes
+    ])
+  ], [
+    have_asciidoc_xmlto=yes
+  ])
+])
+
+AS_IF([test "x$with_sdt" = "xyes"], [
+  AC_MSG_CHECKING([STAP_PROBEV()])
+  AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
+    #define SDT_USE_VARIADIC
+    #include <sys/sdt.h>
+    void fct(void)
+    {
+      STAP_PROBEV(provider,name,1,2,3,4,5,6,7,8,9,10);
+    }
+  ]])], [
+    AC_MSG_RESULT([yes])
+    AC_DEFINE([LTTNG_UST_HAVE_SDT_INTEGRATION], [1], [SystemTap integration via sdt.h])
+  ], [
+    AC_MSG_RESULT([no])
+    AC_MSG_ERROR([dnl
+The sdt.h integration was requested but the STAP_PROBEV define cannot be used.
+Make sure it is installed, and up to date, or use CPPFLAGS=-I/path/ to specify
+a non-standard path to sys/sdt.h
+    ])
+  ])

 ])
 
 ])
 

-# 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"])
+
+##                                                                    ##
+## Set defines for optional features conditionnals in the source code ##
+##                                                                    ##
+
+AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], [LTTng system runtime directory])
+
+# 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])
+
+
+##                                                                          ##
+## Set automake variables for optional feature conditionnals in Makefile.am ##
+##                                                                          ##
+
+AM_CONDITIONAL([ENABLE_EXAMPLES], AE_IS_FEATURE_ENABLED([examples]))
+AM_CONDITIONAL([ENABLE_GEN_TP_EXAMPLES], [test "x$PYTHON" != "x"])
+AM_CONDITIONAL([ENABLE_JAVA_AGENT], AE_IS_FEATURE_ENABLED([java-agent-jul]) || AE_IS_FEATURE_ENABLED([java-agent-log4j]) || AE_IS_FEATURE_ENABLED([java-agent-log4j2]))
+AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_JUL], AE_IS_FEATURE_ENABLED([java-agent-jul]))
+AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_LOG4J], AE_IS_FEATURE_ENABLED([java-agent-log4j]))
+AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_LOG4J2], AE_IS_FEATURE_ENABLED([java-agent-log4j2]))
+AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_LOG4J_COMMON], AE_IS_FEATURE_ENABLED([java-agent-log4j]) || AE_IS_FEATURE_ENABLED([java-agent-log4j2]))
+AM_CONDITIONAL([ENABLE_JNI_INTERFACE], AE_IS_FEATURE_ENABLED([jni-interface]))
+AM_CONDITIONAL([ENABLE_MAN_PAGES], AE_IS_FEATURE_ENABLED([man-pages]))
+AM_CONDITIONAL([ENABLE_NUMA], AE_IS_FEATURE_ENABLED([numa]))
+AM_CONDITIONAL([ENABLE_PYTHON_AGENT], AE_IS_FEATURE_ENABLED([python-agent]))
+AM_CONDITIONAL([ENABLE_UST_DL], [test "x$ac_cv_have_decl_RTLD_DI_LINKMAP" = "xyes"])

 AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
 AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])

+AM_CONDITIONAL([HAVE_CMAKE], [test "x$CMAKE" != "x"])
+AM_CONDITIONAL([HAVE_CXX], [test "$HAVE_CXX11" = "1"])
+AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"])
+AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$ac_cv_header_linux_perf_event_h" = "xyes"])
+AM_CONDITIONAL([HAVE_PYTHON_312_OR_GREATER], [test "x$have_python_312_or_greater" = "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])
+##                                             ##
+## Substitute variables for use in Makefile.am ##
+##                                             ##
+
+# Library versions for libtool
+AC_SUBST([LTTNG_UST_LIBRARY_VERSION], ust_lib_version)
+AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], ust_ctl_lib_version)

 
 

-AM_CFLAGS="-Wall $PTHREAD_CFLAGS"
+# Major soname for python-lttngust
+AC_SUBST([LTTNG_UST_LIB_SONAME_MAJOR], [ust_lib_version_current])
+
+AM_CFLAGS="$OPT_CFLAGS $WARN_CFLAGS $URCU_CFLAGS $PTHREAD_CFLAGS"

 AC_SUBST(AM_CFLAGS)
 
 AC_SUBST(AM_CFLAGS)
 

+AM_CXXFLAGS="$WARN_CXXFLAGS $URCU_CFLAGS $PTHREAD_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.
 # 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"
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h"

 AC_SUBST(AM_CPPFLAGS)
 
 AC_SUBST(JNI_CPPFLAGS)
 
 AC_SUBST(AM_CPPFLAGS)
 
 AC_SUBST(JNI_CPPFLAGS)
 

-AC_CONFIG_FILES([
-       Makefile
-       doc/Makefile
-       doc/examples/Makefile
-       doc/man/Makefile
-       include/Makefile
-       include/lttng/ust-version.h
-       snprintf/Makefile
-       libringbuffer/Makefile
-       liblttng-ust-comm/Makefile
-       liblttng-ust/Makefile
-       liblttng-ust-ctl/Makefile
-       liblttng-ust-fork/Makefile
-       liblttng-ust-dl/Makefile
-       liblttng-ust-fd/Makefile
-       liblttng-ust-java/Makefile
-       liblttng-ust-java-agent/Makefile
-       liblttng-ust-java-agent/java/Makefile
-       liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
-       liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
-       liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
-       liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
-       liblttng-ust-java-agent/jni/Makefile
-       liblttng-ust-java-agent/jni/common/Makefile
-       liblttng-ust-java-agent/jni/jul/Makefile
-       liblttng-ust-java-agent/jni/log4j/Makefile
-       liblttng-ust-libc-wrapper/Makefile
-       liblttng-ust-cyg-profile/Makefile
-       liblttng-ust-python-agent/Makefile
-       python-lttngust/Makefile
-       python-lttngust/setup.py
-       python-lttngust/lttngust/__init__.py
-       tools/Makefile
-       tests/Makefile
-       tests/ctf-types/Makefile
-       tests/hello/Makefile
-       tests/hello-many/Makefile
-       tests/hello.cxx/Makefile
-       tests/same_line_tracepoint/Makefile
-       tests/snprintf/Makefile
-       tests/ust-elf/Makefile
-       tests/benchmark/Makefile
-       tests/pthread_name/Makefile
-       tests/utils/Makefile
-       tests/test-app-ctx/Makefile
-       tests/gcc-weak-hidden/Makefile
-       lttng-ust.pc
-       lttng-ust-ctl.pc
-])
+# Used in man pages
+AC_SUBST([LTTNG_UST_MAJOR_VERSION], ust_version_major)
+AC_SUBST([LTTNG_UST_MINOR_VERSION], ust_version_minor)

 
 

-# 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
-])
+##                                     ##
+## Output files generated by configure ##
+##                                     ##

 
 

-AC_CONFIG_FILES([tests/ust-elf/test_ust_elf],[chmod +x tests/ust-elf/test_ust_elf])
+# List of files to be generated from '.in' templates by AC_OUTPUT
+AC_CONFIG_FILES([
+  Makefile
+  doc/examples/Makefile
+  doc/Makefile
+  doc/man/Makefile
+  extras/Makefile
+  include/Makefile
+  src/common/Makefile
+  src/lib/lttng-ust-common/Makefile
+  src/lib/lttng-ust-ctl/Makefile
+  src/lib/lttng-ust-cyg-profile/Makefile
+  src/lib/lttng-ust-dl/Makefile
+  src/lib/lttng-ust-fd/Makefile
+  src/lib/lttng-ust-fork/Makefile
+  src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
+  src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
+  src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
+  src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
+  src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/Makefile
+  src/lib/lttng-ust-java-agent/java/Makefile
+  src/lib/lttng-ust-java-agent/jni/common/Makefile
+  src/lib/lttng-ust-java-agent/jni/jul/Makefile
+  src/lib/lttng-ust-java-agent/jni/log4j/Makefile
+  src/lib/lttng-ust-java-agent/jni/Makefile
+  src/lib/lttng-ust-java-agent/Makefile
+  src/lib/lttng-ust-java/Makefile
+  src/lib/lttng-ust-libc-wrapper/Makefile
+  src/lib/lttng-ust-pthread-wrapper/Makefile
+  src/lib/lttng-ust-tracepoint/Makefile
+  src/lib/lttng-ust/Makefile
+  src/lib/lttng-ust-python-agent/Makefile
+  src/lib/Makefile
+  src/lib/lttng-ust-ctl.pc
+  src/lib/lttng-ust.pc
+  src/Makefile
+  src/python-lttngust/lttngust/version.py
+  src/python-lttngust/Makefile
+  src/python-lttngust/setup.py
+  tests/benchmark/Makefile
+  tests/compile/api0/ctf-types/Makefile
+  tests/compile/api0/hello.cxx/Makefile
+  tests/compile/api0/hello/Makefile
+  tests/compile/api0/hello-many/Makefile
+  tests/compile/api0/Makefile
+  tests/compile/api0/same_line_tracepoint/Makefile
+  tests/compile/api1/ust-fields/Makefile
+  tests/compile/api1/hello.cxx/Makefile
+  tests/compile/api1/hello/Makefile
+  tests/compile/api1/hello-many/Makefile
+  tests/compile/api1/Makefile
+  tests/compile/api1/same_line_tracepoint/Makefile
+  tests/compile/api1/test-app-ctx/Makefile
+  tests/compile/Makefile
+  tests/Makefile
+  tests/regression/abi0-conflict/Makefile
+  tests/regression/Makefile
+  tests/unit/gcc-weak-hidden/Makefile
+  tests/unit/libcommon/Makefile
+  tests/unit/libmsgpack/Makefile
+  tests/unit/libringbuffer/Makefile
+  tests/unit/Makefile
+  tests/unit/pthread_name/Makefile
+  tests/unit/snprintf/Makefile
+  tests/unit/ust-elf/Makefile
+  tests/unit/ust-error/Makefile
+  tests/unit/ust-utils/Makefile
+  tests/utils/Makefile
+  tools/Makefile
+])

 
 AC_OUTPUT
 
 
 
 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)
+AE_PPRINT_INIT
+AE_PPRINT_SET_INDENT(1)
+AE_PPRINT_SET_TS(38)

 
 AS_ECHO
 
 AS_ECHO

-AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION \"V_NAME\"$PPRINT_COLOR_RST")
-AS_ECHO
-
-AS_ECHO("V_DESC")
+AS_IF([test -n "ust_version_name"], [
+  AS_ECHO("${AE_PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION \"ust_version_name\"$AE_PPRINT_COLOR_RST")
+], [
+  AS_ECHO("${AE_PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION")
+])

 
 AS_ECHO
 
 AS_ECHO

-PPRINT_SUBTITLE([System])

 
 

-PPRINT_PROP_STRING([Target architecture], $host_cpu)
+AS_IF([test -n "ust_version_description"], [
+  AS_IF([test -n "$FOLD"], [
+    AS_ECHO(["ust_version_description"]) | $FOLD -s
+  ], [
+    AS_ECHO(["ust_version_description"])
+  ])
+  AS_ECHO
+])
+
+AE_PPRINT_SUBTITLE([System])

 
 

-test "x$NO_UNALIGNED_ACCESS" != "x1" && value=1 || value=0
-PPRINT_PROP_BOOL([Efficient unaligned memory access], $value)
+AE_PPRINT_PROP_STRING([Target architecture], $host_cpu)

 
 

-AS_IF([test "x$UNSUPPORTED_ARCH" = "x1"],[
-       PPRINT_WARN([Your architecture ($host_cpu) is unsupported, using safe default of no unaligned access.])
+AS_IF([test "x$unsupported_arch" = "xyes"],[
+       AE_PPRINT_WARN([Your architecture ($host_cpu) is unsupported, using safe default of no unaligned access.])

 ])
 
 AS_ECHO
 ])
 
 AS_ECHO

-PPRINT_SUBTITLE([Features])
-PPRINT_SET_INDENT(1)
+AE_PPRINT_SUBTITLE([Features])
+AE_PPRINT_SET_INDENT(1)

 
 test "x$with_sdt" = "xyes" && value=1 || value=0
 
 test "x$with_sdt" = "xyes" && value=1 || value=0

-PPRINT_PROP_BOOL_CUSTOM([sdt.h integration], $value, [use --with-sdt])
+AE_PPRINT_PROP_BOOL_CUSTOM([sdt.h integration], $value, [use --with-sdt])

 
 

-test "x$java_agent_jul" = xyes && value=1 || value=0
-PPRINT_PROP_BOOL_CUSTOM([Java agent (JUL support)], $value, [use --enable-java-agent-jul])
+AE_IS_FEATURE_ENABLED([java-agent-jul]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL_CUSTOM([Java agent (JUL support)], $value, [use --enable-java-agent-jul])

 
 

-test "x$java_agent_log4j" = xyes && value=1 || value=0
-PPRINT_PROP_BOOL_CUSTOM([Java agent (Log4j support)], $value, [use --enable-java-agent-log4j])
+AE_IS_FEATURE_ENABLED([java-agent-log4j]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL_CUSTOM([Java agent (Log4j 1.x support (deprecated))], $value, [use --enable-java-agent-log4j])

 
 

-test "x$jni_interface" = xyes && value=1 || value=0
-PPRINT_PROP_BOOL_CUSTOM([JNI interface (JNI)], $value, [use --enable-jni-interface])
+AE_IS_FEATURE_ENABLED([java-agent-log4j2]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL_CUSTOM([Java agent (Log4j 2.x support)], $value, [use --enable-java-agent-log4j2])

 
 

-test "x$python_agent" = xyes && value=1 || value=0
-PPRINT_PROP_BOOL_CUSTOM([Python agent], $value, [use --enable-python-agent])
+AE_IS_FEATURE_ENABLED([jni-interface]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL_CUSTOM([JNI interface (JNI)], $value, [use --enable-jni-interface])

 
 

-test "x$have_perf_event" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL_CUSTOM([Perf event integration], $value)
+AE_IS_FEATURE_ENABLED([python-agent]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL_CUSTOM([Python agent], $value, [use --enable-python-agent])

 
 

-test "x$enable_numa" = xyes && value=1 || value=0
-PPRINT_PROP_BOOL([NUMA], $value)
+test "x$ac_cv_header_linux_perf_event_h" = "xyes" && value=1 || value=0
+AE_PPRINT_PROP_BOOL_CUSTOM([Perf event integration], $value)
+
+AE_IS_FEATURE_ENABLED([numa]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL([NUMA], $value)

 
 AS_ECHO
 
 AS_ECHO

-PPRINT_SET_INDENT(0)
+AE_PPRINT_SET_INDENT(0)

 
 

-test "x$enable_examples" = xyes && value=1 || value=0
-PPRINT_PROP_BOOL([Build and install examples], $value, $PPRINT_COLOR_SUBTITLE)
+AE_IS_FEATURE_ENABLED([examples]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL([Build and install examples], $value, $AE_PPRINT_COLOR_SUBTITLE)

 
 # man pages build enabled/disabled
 m4_pushdef([build_man_pages_msg], [Build and install man pages])
 
 
 # man pages build enabled/disabled
 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_msg], 1, $PPRINT_COLOR_SUBTITLE)
-       ], [
-               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)
-               ])
-       ])
+AE_IF_FEATURE_ENABLED([man-pages], [
+  AE_IF_IN_GIT_REPO([
+    AE_PPRINT_PROP_BOOL([build_man_pages_msg], 1, $AE_PPRINT_COLOR_SUBTITLE)
+  ], [
+    AS_IF([test "x$have_asciidoc_xmlto" = "xyes"], [
+      AE_PPRINT_PROP_BOOL([build_man_pages_msg], 1, $AE_PPRINT_COLOR_SUBTITLE)
+    ], [
+      AE_PPRINT_PROP_STRING([build_man_pages_msg],
+        [${AE_PPRINT_COLOR_BLDGRN}yes (already built)],
+        $AE_PPRINT_COLOR_SUBTITLE)
+    ])
+  ])

 ], [
 ], [

-       PPRINT_PROP_BOOL([build_man_pages_msg], 0, $PPRINT_COLOR_SUBTITLE)
+  AE_PPRINT_PROP_BOOL([build_man_pages_msg], 0, $AE_PPRINT_COLOR_SUBTITLE)

 ])
 
 m4_popdef([build_man_pages_msg])
 
 ])
 
 m4_popdef([build_man_pages_msg])
 

-PPRINT_SET_INDENT(1)
+AE_PPRINT_SET_INDENT(1)

 
 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
 
 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])
+AE_PPRINT_SUBTITLE([Install directories])
+AE_PPRINT_PROP_STRING([Binaries], [$report_bindir])
+AE_PPRINT_PROP_STRING([Libraries], [$report_libdir])

 
 AS_ECHO
 
 AS_ECHO

-PPRINT_SUBTITLE([System directories])
+AE_PPRINT_SUBTITLE([System directories])

 
 

-PPRINT_PROP_STRING([lttng-sessiond rundir], [$lttng_system_rundir])
+AE_PPRINT_PROP_STRING([lttng-sessiond rundir], [$lttng_system_rundir])

 
 

-PPRINT_SET_INDENT(0)
+AE_PPRINT_SET_INDENT(0)

 
 AS_IF([test "x$warn_prebuilt_man_pages" = "xyes" ], [
 
 AS_IF([test "x$warn_prebuilt_man_pages" = "xyes" ], [

-       AS_ECHO
-       PPRINT_WARN([Both asciidoc and xmlto are needed to build the LTTng-UST man pages.
+  AS_ECHO
+  AE_PPRINT_WARN([dnl
+Both asciidoc and xmlto are needed to build the LTTng-UST man pages.

 
 Note that the man pages are already built in this distribution tarball,
 therefore asciidoc and xmlto are only needed if you intend to modify
 
 Note that the man pages are already built in this distribution tarball,
 therefore asciidoc and xmlto are only needed if you intend to modify


@@ -704,3 +810,5 @@ their sources.
 Use --disable-man-pages to completely disable building and installing
 the man pages.])
 ])
 Use --disable-man-pages to completely disable building and installing
 the man pages.])
 ])

+
+# vim: shiftwidth=2 softtabstop=2 expandtab