fix: handle EINTR correctly in get_cpu_mask_from_sysfs
[lttng-ust.git] / configure.ac
index 54c8779116108aac0448e218c456cf079d5b0c51..a1c12412e7445c6cd8699a527488cb7fad9203d5 100644 (file)
@@ -7,12 +7,12 @@ 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_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], [[Codename TBD]])
-m4_define([ust_version_description], [[Description TBD]])
+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
@@ -38,10 +38,9 @@ m4_define([ust_ctl_lib_version], ust_ctl_lib_version_current[:]ust_ctl_lib_versi
 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 include/lttng/ust-version.h])
+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_SRCDIR([include/lttng/tracepoint.h])
 
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -58,6 +57,36 @@ AM_MAINTAINER_MODE([enable])
 AM_SILENT_RULES([yes])
 
 
+##                               ##
+## OS and Arch specific defaults ##
+##                               ##
+
+# Set os specific options
+AS_CASE([$host_os],
+  [freebsd*], [AE_FEATURE_DISABLE([numa])]
+)
+
+# 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 ##
 ##                   ##
@@ -106,6 +135,56 @@ AC_TYPE_UINT64_T
 AC_TYPE_UINT8_T
 AC_CHECK_TYPES([ptrdiff_t])
 
+# 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
+])
+
+# 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])
+
+# 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"
+
+# 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])
+
 
 ##                     ##
 ## C++ compiler checks ##
@@ -113,7 +192,14 @@ AC_CHECK_TYPES([ptrdiff_t])
 
 # Find an optional C++11 compiler without GNU extensions (-std=c++11)
 AX_CXX_COMPILE_STDCXX([11], [noext], [optional])
-AM_CONDITIONAL([HAVE_CXX], [test "$HAVE_CXX11" = "1"])
+
+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++])
+])
 
 
 ##               ##
@@ -158,10 +244,6 @@ AC_CHECK_PROGS([XMLTO], [xmlto])
 
 AM_PATH_PYTHON([2.7], [], [PYTHON=""])
 
-AX_PROG_JAVAC
-AX_PROG_JAVA
-AX_PROG_JAR
-
 # Initialize and configure libtool
 LT_INIT([disable-static])
 
@@ -180,6 +262,7 @@ AC_CHECK_FUNCS([ \
   clock_gettime \
   ftruncate \
   getpagesize \
+  gettid \
   gettimeofday \
   localeconv \
   memchr \
@@ -203,8 +286,8 @@ AC_CHECK_FUNCS([ \
 #AC_FUNC_REALLOC
 
 # Check for pthread_setname_np and its signature
-LTTNG_PTHREAD_SETNAME_NP
-LTTNG_PTHREAD_GETNAME_NP
+AE_PTHREAD_SETNAME_NP
+AE_PTHREAD_GETNAME_NP
 
 # Check dor dlopen() in -ldl or -lc
 AC_CHECK_LIB([dl], [dlopen], [
@@ -230,240 +313,243 @@ AC_CHECK_LIB([$libdl_name], [dlmopen], [
 PKG_CHECK_MODULES([URCU], [liburcu >= 0.12])
 
 
-AM_CONDITIONAL([HAVE_CMAKE], [test "x$CMAKE" != "x"])
-
-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])
-])
-
-# Set architecture specific options
-AS_CASE([$host_cpu],
-       [i[[3456]]86], [],
-       [x86_64], [],
-       [amd64], [],
-       [powerpc], [],
-       [ppc64], [],
-       [ppc64le], [],
-       [powerpc64], [],
-       [powerpc64le], [],
-       [s390], [],
-       [s390x], [],
-       [arm*], [
-               NO_NUMA=1
-               ],
-       [aarch64*], [],
-       [mips*], [],
-       [tile*], [],
-       [
-               UNSUPPORTED_ARCH=1
-       ])
+##                 ##
+## User variables  ##
+##                 ##
 
-# Set os specific options
-AS_CASE([$host_os],
-       [freebsd*], [NO_NUMA=1]
+# 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]])]
 )
 
-# Configuration options, which will be installed in the config.h
-AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h])
-
-
-AM_CONDITIONAL([ENABLE_UST_DL], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"])
-
-# 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])
+# 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".]),
 ], [
-       enable_numa=$enableval
+  lttng_system_rundir="$withval"
 ], [
-       enable_numa=yes
+  lttng_system_rundir="/var/run/lttng"
 ])
 
-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
-])
-AM_CONDITIONAL([ENABLE_NUMA], [test "x$have_libnuma" = "xyes"])
 
-AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$ac_cv_header_linux_perf_event_h" = "xyes"])
+##                                          ##
+## Check for conflicting features selection ##
+##                                          ##
 
-# 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]])
-], [
-       jni_interface=$enableval
-], [
-       jni_interface=no
+AE_IF_FEATURE_DISABLED([shared], [
+  AC_MSG_ERROR(LTTng-UST requires shared libraries to be enabled)
 ])
 
-AM_CONDITIONAL([ENABLE_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
-
-
-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_ENABLED([static], [
+  AC_MSG_ERROR(Static linking LTTng-UST is currently unsupported)
 ])
 
-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([java-agent-all], [
+  AE_FEATURE_ENABLE([java-agent-jul])
+  AE_FEATURE_ENABLE([java-agent-log4j])
+  AE_FEATURE_ENABLE([java-agent-log4j2])
 ])
 
-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([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
-       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"
-])
 
-AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"])
+##                                          ##
+## Check for optional features dependencies ##
+##                                          ##
 
-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"])
-       ])
+# 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([ENABLE_PYTHON_AGENT], [test "x$python_agent" = "xyes"])
-
-# 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 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"
 ])
 
-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 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"
+    ])
+  ])
 ])
 
-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 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_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
-               [LTTng system runtime directory])
 
-AM_CONDITIONAL([ENABLE_GEN_TP_EXAMPLES], [test "x$PYTHON" != "x"])
-
-# Enable building examples
-AC_ARG_ENABLE(
-       examples,
-       AS_HELP_STRING(
-               [--disable-examples],
-               [Do not build and install examples]
-       ),
-       [enable_examples=$enableval],
-       [enable_examples=yes]
-)
+# 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.
+    ])
+  ])
 
-AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" != "xno"])
-
-# 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]
-)
+  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.])
+    ])
+  ])
+])
 
 # 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"], [
-       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([
+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.
-                       ])
-               ], [
-                       # 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([ENABLE_MAN_PAGES], [test "x$man_pages_opt" != "xno"])
-AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
 
+##                                                                    ##
+## 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])
@@ -474,16 +560,51 @@ AC_DEFINE([LTTNG_UST_LIB_SONAME_MAJOR], [ust_lib_version_current], [Major SONAME
 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"
+##                                                                          ##
+## 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_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"])
+
+
+##                                             ##
+## 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)
+
+# 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)
 
-AM_CXXFLAGS="$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.
-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)
@@ -495,58 +616,73 @@ AC_SUBST(JNI_CPPFLAGS)
 
 # 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
-       snprintf/Makefile
-       libcounter/Makefile
-       libmsgpack/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/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
-       lttng-ust.pc
-       lttng-ust-ctl.pc
+  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
@@ -556,109 +692,113 @@ AC_OUTPUT
 ## 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_IF([test -n "ust_version_name"], [
-  AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION \"ust_version_name\"$PPRINT_COLOR_RST")
+  AS_ECHO("${AE_PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION \"ust_version_name\"$AE_PPRINT_COLOR_RST")
 ], [
-  AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION")
+  AS_ECHO("${AE_PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION")
 ])
 
 AS_ECHO
 
 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"]) | $FOLD -s
   ], [
-    AS_ECHO("ust_version_description")
+    AS_ECHO(["ust_version_description"])
   ])
   AS_ECHO
 ])
 
-PPRINT_SUBTITLE([System])
+AE_PPRINT_SUBTITLE([System])
 
-PPRINT_PROP_STRING([Target architecture], $host_cpu)
+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
-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
-PPRINT_PROP_BOOL_CUSTOM([sdt.h integration], $value, [use --with-sdt])
+AE_PPRINT_PROP_BOOL_CUSTOM([sdt.h integration], $value, [use --with-sdt])
+
+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_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-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$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-log4j2]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL_CUSTOM([Java agent (Log4j 2.x support)], $value, [use --enable-java-agent-log4j2])
 
-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([jni-interface]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL_CUSTOM([JNI interface (JNI)], $value, [use --enable-jni-interface])
 
-test "x$python_agent" = xyes && value=1 || value=0
-PPRINT_PROP_BOOL_CUSTOM([Python agent], $value, [use --enable-python-agent])
+AE_IS_FEATURE_ENABLED([python-agent]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL_CUSTOM([Python agent], $value, [use --enable-python-agent])
 
 test "x$ac_cv_header_linux_perf_event_h" = "xyes" && value=1 || value=0
-PPRINT_PROP_BOOL_CUSTOM([Perf event integration], $value)
+AE_PPRINT_PROP_BOOL_CUSTOM([Perf event integration], $value)
 
-test "x$enable_numa" = xyes && value=1 || value=0
-PPRINT_PROP_BOOL([NUMA], $value)
+AE_IS_FEATURE_ENABLED([numa]) && value=1 || value=0
+AE_PPRINT_PROP_BOOL([NUMA], $value)
 
 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])
 
-AS_IF([test "x$man_pages_opt" != "xno"], [
-       AE_IF_IN_GIT_REPO([
-               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])
 
-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
-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
-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_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
@@ -667,3 +807,5 @@ their sources.
 Use --disable-man-pages to completely disable building and installing
 the man pages.])
 ])
+
+# vim: shiftwidth=2 softtabstop=2 expandtab
This page took 0.033494 seconds and 4 git commands to generate.