X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=d089cfaa6445c7d853d01fcf3e3d36fd860e3eac;hb=2eba8e397d36e8cecaf4731b4f892dc57f32a382;hp=f698e973342847a4e53f073f55685ed8dcf10006;hpb=10544ee8af31afb239e3dfa71cb2fe09d3de3771;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index f698e973..d089cfaa 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,3 +1,5 @@
+# SPDX-License-Identifier: LGPL-2.1-only
+
 dnl Version infos
 m4_define([V_MAJOR], [2])
 m4_define([V_MINOR], [13])
@@ -20,7 +22,7 @@ AC_SUBST([PATCHLEVEL_VERSION], [V_PATCH])
 # 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])
 
@@ -31,7 +33,7 @@ AC_DEFINE([CONFIG_LTTNG_UST_LIBRARY_VERSION_MAJOR], [UST_LIB_V_MAJOR], [Major SO
 
 # 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])
@@ -51,7 +53,8 @@ AM_SILENT_RULES([yes])
 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
@@ -164,6 +167,7 @@ AC_CHECK_FUNCS([ \
 
 # 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
@@ -192,18 +196,16 @@ AS_CASE([$host_cpu],
 	[ppc64le], [],
 	[powerpc64], [],
 	[powerpc64le], [],
-	[s390], [NO_UNALIGNED_ACCESS=1],
-	[s390x], [NO_UNALIGNED_ACCESS=1],
+	[s390], [],
+	[s390x], [],
 	[arm*], [
-		NO_UNALIGNED_ACCESS=1
 		NO_NUMA=1
 		],
-	[aarch64*], [NO_UNALIGNED_ACCESS=1],
-	[mips*], [NO_UNALIGNED_ACCESS=1],
-	[tile*], [NO_UNALIGNED_ACCESS=1],
+	[aarch64*], [],
+	[mips*], [],
+	[tile*], [],
 	[
 		UNSUPPORTED_ARCH=1
-		NO_UNALIGNED_ACCESS=1
 	])
 
 # Set os specific options
@@ -212,9 +214,7 @@ AS_CASE([$host_os],
 )
 
 # 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], [
@@ -280,12 +280,9 @@ AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes], [])
 # 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])
-])
-
-AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [
-	AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
+	AC_DEFINE([HAVE_PERF_EVENT], [1])
 ])
 
 # Check for JNI header files if requested
@@ -471,15 +468,6 @@ they will not be installed.
 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])
-
 AM_CFLAGS="-Wall $URCU_CFLAGS $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
@@ -550,17 +538,6 @@ AC_CONFIG_FILES([
 	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
 
 
@@ -583,9 +560,6 @@ 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.])
 ])