Fix: Use 2.12 custom mutex nest getter

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4cc65e1d70fb4f0a7f75adbd2030fa4f2e68e428..4026155b1bde24cb092ff418943fd211d9a1bdbb 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -8,7 +8,7 @@ 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], [3])
+m4_define([ust_version_patch], [5])
 m4_define([ust_version_dev_stage], [])
 m4_define([ust_version], ust_version_major[.]ust_version_minor[.]ust_version_patch[]ust_version_dev_stage)
 m4_define([ust_version_name], [[Nordicité]])
@@ -371,6 +371,11 @@ AE_FEATURE([examples],[Do not build and install examples])
 AE_FEATURE_DEFAULT_ENABLE
 AE_FEATURE([man-pages],[Do not build and install man pages (already built in a distributed tarball)])
 
+# Custom upgrade conflicting symbols
+# Disabled by default
+AE_FEATURE_DEFAULT_DISABLE
+AE_FEATURE([custom-upgrade-conflicting-symbols],[Emit and use original symbols for custom upgrade from 2.12 to 2.13])
+
 # Systemtap sdt.h integration
 # Disabled by default
 AC_ARG_WITH([sdt],
@@ -508,6 +513,11 @@ they will not be installed.
   ])
 ])
 
+# Emit and use original symbols for custom upgrade from 2.12 to 2.13
+AE_IF_FEATURE_ENABLED([custom-upgrade-conflicting-symbols], [
+  AC_DEFINE([LTTNG_UST_CUSTOM_UPGRADE_CONFLICTING_SYMBOLS], [1], [Emit and use original symbols for custom upgrade from 2.12 to 2.13])
+])
+
 AS_IF([test "x$with_sdt" = "xyes"], [
   AC_MSG_CHECKING([STAP_PROBEV()])
   AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
@@ -567,7 +577,7 @@ 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([ENABLE_LTTNG_UST_CUSTOM_UPGRADE_CONFLICTING_SYMBOLS], AE_IS_FEATURE_ENABLED([custom-upgrade-conflicting-symbols]))
 
 ##                                             ##
 ## Substitute variables for use in Makefile.am ##