X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=be93880c987813122ffef888d9eb00a293af05d4;hb=4318ae1be57eb7983ab4857a7a8eeb4a030a8216;hp=10e1af443a4b61bdbf2786d9e458bbe366aecdd2;hpb=57773204abc43ed7d4350ac0d641ddbbda1e441e;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 10e1af44..be93880c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,8 +8,8 @@ AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AC_CONFIG_SRCDIR([include/ust/tracepoint.h])
-AC_CONFIG_HEADERS([config.h include/ust/config.h])
+AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
+AC_CONFIG_HEADERS([config.h include/lttng/config.h])
 AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
 # Compute minor/major version numbers
 major_version=`echo AC_PACKAGE_VERSION | sed 's/\..*//'`
@@ -59,6 +59,27 @@ CFLAGS="-Wall $CFLAGS"
 AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CFLAGS]=-Idir to specify their location.
 This error can also occur when the liburcu package's configure script has not been run.])])
 
+AC_MSG_CHECKING([caa_likely()])
+AC_TRY_COMPILE(
+[
+#include <urcu/compiler.h>
+],
+[
+void fct(void)
+{
+	if (caa_likely(1)) {
+	}
+}
+],
+[
+	AC_MSG_RESULT([yes])
+],
+[
+	AC_MSG_RESULT([no])
+	AC_MSG_ERROR([Please upgrade your version of liburcu to 0.6.6 or better])
+]
+)
+
 # 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.])])
 
@@ -200,7 +221,7 @@ AC_CONFIG_FILES([
 	libustfork/Makefile
 	snprintf/Makefile
 	ust.pc
-	include/ust/version.h
+	include/lttng/version.h
 	libustjava/Makefile
 ])
 AC_OUTPUT