Add -ust to the name of UST threads of the application

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 64ac088996fa948843e7a73a3510c955dfa3ed37..de462ffcc67f329a89752737d2fde0934d2fc012 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3,13 +3,13 @@ dnl Process this file with autoconf to produce a configure script.
 
 dnl Version infos
 m4_define([V_MAJOR], [2])
-m4_define([V_MINOR], [8])
+m4_define([V_MINOR], [9])
 m4_define([V_PATCH], [0])
-m4_define([V_EXTRA], [rc1])
+m4_define([V_EXTRA], [pre])
 m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
 m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])])
-m4_define([V_NAME], [[Isseki Nicho]])
-m4_define([V_DESC], [[The result of a collaboration between "Dieu du Ciel!" and Nagano-based "Shiga Kogen", Isseki Nicho is a strong Imperial Dark Saison offering a rich roasted malt flavor combined with a complex fruity finish typical of Saison yeasts.]])
+m4_define([V_NAME], [[J-TBD]])
+m4_define([V_DESC], [[]])
 
 AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com])
 
@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
 
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+
 # Configuration options, which will be installed in the config.h
 AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h])
 AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
@@ -133,6 +135,11 @@ 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])
@@ -234,7 +241,7 @@ AS_CASE([$host_cpu],
        [s390], [NO_UNALIGNED_ACCESS=1],
        [s390x], [NO_UNALIGNED_ACCESS=1],
        [arm*], [NO_UNALIGNED_ACCESS=1],
-       [aarch64], [NO_UNALIGNED_ACCESS=1],
+       [aarch64*], [NO_UNALIGNED_ACCESS=1],
        [mips*], [NO_UNALIGNED_ACCESS=1],
        [tile*], [NO_UNALIGNED_ACCESS=1],
        [
@@ -424,6 +431,15 @@ and installing the man pages.
 AM_CONDITIONAL([MAN_PAGES_OPT], [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])
+
 AC_CONFIG_FILES([
        Makefile
        doc/Makefile
@@ -441,7 +457,7 @@ AC_CONFIG_FILES([
        liblttng-ust-java/Makefile
        liblttng-ust-java-agent/Makefile
        liblttng-ust-java-agent/java/Makefile
-       liblttng-ust-java-agent/java/liblttng-ust-agent/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
@@ -466,6 +482,7 @@ AC_CONFIG_FILES([
        tests/benchmark/Makefile
        tests/utils/Makefile
        tests/test-app-ctx/Makefile
+       tests/gcc-weak-hidden/Makefile
        lttng-ust.pc
 ])