# 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é]])
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],
])
])
+# 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([[
tests/regression/abi0-conflict/Makefile
tests/regression/Makefile
tests/unit/gcc-weak-hidden/Makefile
+ tests/unit/libcommon/Makefile
tests/unit/libmsgpack/Makefile
tests/unit/libringbuffer/Makefile
tests/unit/Makefile