fix: allow building with userspace-rcu 0.13

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 2264e50394b3e02840393eb128f36a83fada32aa..a4fb30826f08b2553afa9cbd99aa3014ceb6edbc 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 dnl Version infos
 m4_define([V_MAJOR], [2])
 m4_define([V_MINOR], [11])
-m4_define([V_PATCH], [3])
+m4_define([V_PATCH], [4])
 dnl m4_define([V_EXTRA], [])
 m4_define([V_NAME], [[Lafontaine]])
 m4_define([V_DESC], [[A modern Saison beer from Montréal's Oshlag microbrewery, Lafontaine is a refreshing, zesty, rice beer with hints of fruit and spices.]])
@@ -276,10 +276,12 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
 ])
 
 # urcu - check that URCU lib is available to compilation
-AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
+# Check for 'synchronize_rcu_bp' and then failback to 'urcu_bp_synchronize_rcu' as the former was
+# removed from the ABI in liburcu 0.13.
+AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [
+       AC_CHECK_LIB([urcu-bp], [urcu_bp_synchronize_rcu], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
+])
 
-# urcu - check that URCU lib is at least version 0.6
-AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])])
 
 # numa.h integration
 AS_IF([test "x$NO_NUMA" = "x1"],[