+# SPDX-License-Identifier: LGPL-2.1-only
+
dnl Version infos
m4_define([V_MAJOR], [2])
m4_define([V_MINOR], [13])
# 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_MAJOR], [1])
m4_define([UST_LIB_V_MINOR], [0])
m4_define([UST_LIB_V_PATCH], [0])
# 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_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [5:0:0])
AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h])
AC_CONFIG_AUX_DIR([config])
AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc -Wall -Wno-portability -Werror])
AM_MAINTAINER_MODE([enable])
-# Enable silent rules if available (Introduced in AM 1.11)
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
+# Enable silent rules by default
+AM_SILENT_RULES([yes])
# Checks for C compiler
AC_USE_SYSTEM_EXTENSIONS
AC_SYS_LARGEFILE
AC_PROG_CC
-AC_PROG_CC_STDC
+# AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70
+m4_version_prereq([2.70], [], [AC_PROG_CC_STDC])
AC_PROG_CXX
AX_CXX_COMPILE_STDCXX([11])
RW_PROG_CXX_WORKS
# Check for pthread_setname_np and its signature
LTTNG_PTHREAD_SETNAME_NP
+LTTNG_PTHREAD_GETNAME_NP
# AC_FUNC_MALLOC causes problems when cross-compiling.
#AC_FUNC_MALLOC
# 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.
AC_CHECK_LIB([dl], [dlopen], [
AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"])
-# 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])
-])
-
-# 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])
-])
-
-# 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.])])
-
-# 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.])])
+# Require URCU >= 0.12 for DEFINE_URCU_TLS_INIT
+PKG_CHECK_MODULES([URCU], [liburcu >= 0.12])
# numa.h integration
AS_IF([test "x$NO_NUMA" = "x1"],[
# perf, using the read system call as fallback.
AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$have_perf_event" = "xyes"])
+AH_TEMPLATE([HAVE_PERF_EVENT], ["Perf event integration via perf_event.h"])
AS_IF([test "x$have_perf_event" = "xyes"], [
- AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1])
+ AC_DEFINE([HAVE_PERF_EVENT], [1])
])
AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [
_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
-AM_CFLAGS="-Wall $PTHREAD_CFLAGS"
+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.
include/Makefile
include/lttng/ust-version.h
snprintf/Makefile
+ libcounter/Makefile
+ libmsgpack/Makefile
libringbuffer/Makefile
liblttng-ust-comm/Makefile
liblttng-ust/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
lttng-ust-ctl.pc
])
-# Create link for python agent for the VPATH guru.
-AC_CONFIG_LINKS([
- python-lttngust/lttngust/agent.py:python-lttngust/lttngust/agent.py
- python-lttngust/lttngust/cmd.py:python-lttngust/lttngust/cmd.py
- python-lttngust/lttngust/compat.py:python-lttngust/lttngust/compat.py
- python-lttngust/lttngust/debug.py:python-lttngust/lttngust/debug.py
- python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py
-])
-
-AC_CONFIG_FILES([tests/unit/ust-elf/test_ust_elf],[chmod +x tests/unit/ust-elf/test_ust_elf])
-
AC_OUTPUT
projects / lttng-ust.git / blobdiff