-dnl Version infos
-m4_define([V_MAJOR], [2])
-m4_define([V_MINOR], [10])
-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_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], [13])
+m4_define([ust_version_patch], [0])
+m4_define([ust_version_dev_stage], [-pre])
+m4_define([ust_version], ust_version_major[.]ust_version_minor[.]ust_version_patch[]ust_version_dev_stage)
+m4_define([ust_version_name], [[Codename TBD]])
+m4_define([ust_version_description], [[Description TBD]])
+
+# Library version information of "liblttng-ust"
+# Following the numbering scheme proposed by libtool for the library version
+# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
+m4_define([ust_lib_version_current], [1])
+m4_define([ust_lib_version_revision], [0])
+m4_define([ust_lib_version_age], [0])
+m4_define([ust_lib_version], ust_lib_version_current[:]ust_lib_version_revision[:]ust_lib_version_age)
+# Library version information of "liblttng-ust-ctl"
# Following the numbering scheme proposed by libtool for the library version
# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
-# This is the library version of liblttng-ust.
-AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0])
-# note: remember to update tracepoint.h dlopen() to match this version
-# number. TODO: eventually automate by exporting the major number.
+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)
-# 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])
-AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h])
+## ##
+## Autoconf base setup ##
+## ##
+
+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_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
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_MAINTAINER_MODE([enable])
-# Enable silent rules if available (Introduced in AM 1.11)
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+## ##
+## Automake base setup ##
+## ##
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
+AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc -Wall -Wno-portability -Werror])
+AM_MAINTAINER_MODE([enable])
-# Checks for C compiler
-AC_USE_SYSTEM_EXTENSIONS
-AC_SYS_LARGEFILE
-AC_PROG_CC
-AC_PROG_CC_STDC
-AC_PROG_CXX
-rw_PROG_CXX_WORKS
-AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
+# Enable silent rules by default
+AM_SILENT_RULES([yes])
-# Check if the compiler support 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.])
-])
+## ##
+## C compiler checks ##
+## ##
-# Checks for programs.
-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"])
+# 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])
-# 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
-])
+# 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])])
-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)
+# Enable available system extensions and LFS support
+AC_USE_SYSTEM_EXTENSIONS
+AC_SYS_LARGEFILE
- 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
-AC_TYPE_INT8_T
+AC_C_TYPEOF
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_UINT8_T
AC_TYPE_UINT16_T
AC_TYPE_UINT32_T
AC_TYPE_UINT64_T
+AC_TYPE_UINT8_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])])
-# Checks for library functions.
+## ##
+## C++ compiler checks ##
+## ##
+
+# 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"])
+
+
+## ##
+## 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 \
+])
+
+# 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>]])
+])
+
+
+## ##
+## Programs checks ##
+## ##
+
+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])
+
+AM_PATH_PYTHON([2.7], [], [PYTHON=""])
+
+AX_PROG_JAVAC
+AX_PROG_JAVA
+AX_PROG_JAR
+
+# Initialize and configure libtool
+LT_INIT([disable-static])
+
+
+## ##
+## Library checks ##
+## ##
+
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 \
+ atexit \
+ clock_gettime \
+ ftruncate \
+ getpagesize \
+ gettimeofday \
+ localeconv \
+ memchr \
+ memmove \
+ memset \
+ mkdir \
+ munmap \
+ realpath \
+ sched_getcpu \
+ socket \
+ strchr \
+ strdup \
+ strerror \
+ strtol \
+ strtoul \
+ sysconf \
])
# AC_FUNC_MALLOC causes problems when cross-compiling.
#AC_FUNC_MALLOC
+#AC_FUNC_REALLOC
-# 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 \
-])
+# Check for pthread_setname_np and its signature
+LTTNG_PTHREAD_SETNAME_NP
+LTTNG_PTHREAD_GETNAME_NP
-# 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])
-
-# Checks for libraries.
+# Check dor dlopen() in -ldl or -lc
AC_CHECK_LIB([dl], [dlopen], [
- have_libdl=yes
- libdl_name=dl
+ 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
- ], [
- AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.])
- ])
+ # 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)
-# 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])]
-)
-
-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 <dlfcn.h>
- ])
-], [
- ac_cv_have_decl_RTLD_DI_LINKMAP="no"
+# Check if libdl has dlmopen()
+AC_CHECK_LIB([$libdl_name], [dlmopen], [
+ AC_DEFINE([HAVE_DLMOPEN], [1], [Define to 1 if dlmopen is available.])
])
-AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"])
-
-# URCU
+# Require URCU >= 0.12 for DEFINE_URCU_TLS_INIT
+PKG_CHECK_MODULES([URCU], [liburcu >= 0.12])
-# 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.])])
+AM_CONDITIONAL([HAVE_CMAKE], [test "x$CMAKE" != "x"])
-AC_MSG_CHECKING([caa_likely()])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
- #include <urcu/compiler.h>
- void fct(void)
- {
- if (caa_likely(1)) {
- }
- }
-]])], [
+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([Please upgrade your version of liburcu to 0.6.6 or better])
-])
-
-# 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.])])
-
-# optional linux/perf_event.h
-AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes], [])
-
-# 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"])
-
-AS_IF([test "x$have_perf_event" = "xyes"], [
- AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1])
+ AC_MSG_ERROR([LTTng-UST requires shared libraries to be enabled])
])
-AC_MSG_CHECKING([host system alignment requirements])
+# Set architecture specific options
AS_CASE([$host_cpu],
[i[[3456]]86], [],
[x86_64], [],
[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],
+ [s390], [],
+ [s390x], [],
+ [arm*], [
+ NO_NUMA=1
+ ],
+ [aarch64*], [],
+ [mips*], [],
+ [tile*], [],
[
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])
+# 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_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])
+], [
+ enable_numa=$enableval
+], [
+ enable_numa=yes
+])
+
+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 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=no
])
-AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
+AM_CONDITIONAL([ENABLE_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
AC_ARG_ENABLE([java-agent-jul], [
java_agent_log4j=$enableval
], [:])
-AM_CONDITIONAL([BUILD_JAVA_AGENT], [test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"])
-AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_JUL], [test "x$java_agent_jul" = "xyes"])
-AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_LOG4J], [test "x$java_agent_log4j" = "xyes"])
+AM_CONDITIONAL([ENABLE_JAVA_AGENT], [test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"])
+AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_JUL], [test "x$java_agent_jul" = "xyes"])
+AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_LOG4J], [test "x$java_agent_log4j" = "xyes"])
AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"], [
AX_JAVA_OPTIONS
- 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
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])
], [
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])
-])
+AM_CONDITIONAL([ENABLE_PYTHON_AGENT], [test "x$python_agent" = "xyes"])
# sdt.h integration
AC_ARG_WITH([sdt], [
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"])
+AM_CONDITIONAL([ENABLE_GEN_TP_EXAMPLES], [test "x$PYTHON" != "x"])
-# 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 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"])
# Enable building man pages (user's intention).
AC_ARG_ENABLE(
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"], [
+ 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
# Export man page build condition: build the man pages if the user
# asked for it, and if the tools are available.
-AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"])
+AM_CONDITIONAL([ENABLE_MAN_PAGES], [test "x$man_pages_opt" != "xno"])
AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
-# Default values
-AC_DEFUN([_AC_DEFINE_AND_SUBST], [
- AC_DEFINE_UNQUOTED([CONFIG_$1], [$2], [$1])
- $1="$2"
- AC_SUBST([$1])
-])
-_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
+# Defined in include/lttng/ust-version.h
+AC_DEFINE([LTTNG_UST_MAJOR_VERSION], ust_version_major, [LTTng UST major version])
+AC_DEFINE([LTTNG_UST_MINOR_VERSION], ust_version_minor, [LTTng UST minor version])
+AC_DEFINE([LTTNG_UST_PATCHLEVEL_VERSION], ust_version_patch, [LTTng UST patch version])
+AC_DEFINE([LTTNG_UST_VERSION], ["]ust_version["], [LTTng UST version string])
+AC_DEFINE([LTTNG_UST_LIB_SONAME_MAJOR], [ust_lib_version_current], [Major SONAME number of liblttng-ust])
+AC_DEFINE([LTTNG_UST_CTL_LIB_SONAME_MAJOR], [ust_ctl_lib_version_current], [Major SONAME number of liblttng-ust-ctl])
+
-AM_CFLAGS="-Wall"
+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)
+
+## ##
+## Output files generated by configure ##
+## ##
+
+# List of files to be generated from '.in' templates by AC_OUTPUT
AC_CONFIG_FILES([
Makefile
doc/Makefile
doc/examples/Makefile
doc/man/Makefile
include/Makefile
- include/lttng/ust-version.h
snprintf/Makefile
+ libcounter/Makefile
+ libmsgpack/Makefile
libringbuffer/Makefile
liblttng-ust-comm/Makefile
liblttng-ust/Makefile
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
-])
-
-# 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/debug.py:python-lttngust/lttngust/debug.py
- python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py
+ lttng-ust-ctl.pc
])
AC_OUTPUT
-#
-# Mini-report on what will be built.
-#
+## ##
+## Mini-report on what will be built. ##
+## ##
PPRINT_INIT
PPRINT_SET_INDENT(1)
PPRINT_SET_TS(38)
AS_ECHO
-AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION \"V_NAME\"$PPRINT_COLOR_RST")
+AS_IF([test -n "ust_version_name"], [
+ AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION \"ust_version_name\"$PPRINT_COLOR_RST")
+], [
+ AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION")
+])
+
AS_ECHO
-AS_ECHO("V_DESC")
+AS_IF([test -n "ust_version_description"], [
+ AS_IF([test -n "$FOLD"], [
+ AS_ECHO("`AS_ECHO("ust_version_description") | $FOLD -s`")
+ ], [
+ AS_ECHO("ust_version_description")
+ ])
+ AS_ECHO
+])
-AS_ECHO
PPRINT_SUBTITLE([System])
PPRINT_PROP_STRING([Target architecture], $host_cpu)
-test "x$NO_UNALIGNED_ACCESS" != "x1" && value=1 || value=0
-PPRINT_PROP_BOOL([Efficient unaligned memory access], $value)
-
AS_IF([test "x$UNSUPPORTED_ARCH" = "x1"],[
PPRINT_WARN([Your architecture ($host_cpu) is unsupported, using safe default of no unaligned access.])
])
test "x$python_agent" = xyes && value=1 || value=0
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)
+
+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])
AS_IF([test "x$man_pages_opt" != "xno"], [
- AS_IF([test "x$in_git_repo" = "xyes"], [
+ AE_IF_IN_GIT_REPO([
PPRINT_PROP_BOOL([build_man_pages_msg], 1, $PPRINT_COLOR_SUBTITLE)
], [
AS_IF([test "x$have_asciidoc_xmlto" = "xyes"], [
projects / lttng-ust.git / blobdiff