X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=66dd016931aeabb5aefdddc7ecf5983d03fff0de;hp=36f00de2a941c0e4c5920f36a1c6241628177f9b;hb=91c96f622ad9eadbf44a63b55289f673be9cf90e;hpb=4fb28dfc10106c4095ca3b1155d4da9a04467fd1

diff --git a/configure.ac b/configure.ac
index 36f00de2a..66dd01693 100644
--- a/configure.ac
+++ b/configure.ac
@@ -481,35 +481,10 @@ PKG_CHECK_MODULES([libxml2], [libxml-2.0 >= 2.7.6])
 AC_CHECK_FUNC([clock_gettime], [AC_DEFINE_UNQUOTED([LTTNG_HAVE_CLOCK_GETTIME], 1, [Has clock_gettime() support.])])
 
 # URCU library version needed or newer
-m4_define([WRONG_LIBURCU_MSG], [Userspace RCU (liburcu) >= 0.9.0 is needed])
-
-# Check liburcu needed function calls
-AC_CHECK_DECL([cds_list_add], [],
-	[AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu/list.h>]])
-AC_CHECK_DECL([cds_wfcq_init], [],
-	[AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu/wfcqueue.h>]])
-AC_CHECK_DECL([cds_wfcq_dequeue_blocking], [],
-	[AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu/wfcqueue.h>]])
-AC_CHECK_DECL([futex_async], [],
-	[AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu/futex.h>]])
-AC_CHECK_DECL([rcu_thread_offline], [],
-	[AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu.h>]])
-AC_CHECK_DECL([rcu_thread_online], [],
-	[AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu.h>]])
-AC_CHECK_DECL([caa_likely], [],
-	[AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu.h>]])
-AC_CHECK_LIB([urcu-cds], [_cds_lfht_new], [],
-	[AC_MSG_ERROR([WRONG_LIBURCU_MSG])])
-
-#Function added in urcu 0.7.0
-AC_CHECK_DECL([cmm_smp_mb__before_uatomic_or], [],
-        [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu.h>]]
-)
-
-#Function added in urcu 0.9.0
-AC_CHECK_DECL([urcu_ref_get_unless_zero], [],
-        [AC_MSG_ERROR([WRONG_LIBURCU_MSG])], [[#include <urcu/ref.h>]]
-)
+PKG_CHECK_MODULES([URCU], [liburcu >= 0.9])
+PKG_CHECK_MODULES([URCU_BP], [liburcu-bp >= 0.9])
+PKG_CHECK_MODULES([URCU_CDS], [liburcu-cds >= 0.9])
+AM_CPPFLAGS="$AM_CPPFLAGS $URCU_CFLAGS"
 
 # Check for libkmod, it will be auto-neabled if found but won't fail if it's not,
 # it can be explicitly disabled with --without-kmod
@@ -621,10 +596,8 @@ AX_HAVE_EPOLL(
 )
 AX_CONFIG_FEATURE(
 	[epoll], [This platform supports epoll(7)],
-	[HAVE_EPOLL], [This platform supports epoll(7).],
-	[enable_epoll="yes"], [enable_epoll="no"]
+	[HAVE_EPOLL], [This platform supports epoll(7).]
 )
-AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
 
 AS_IF([test "x$ac_cv_func_dirfd" = "xyes"],
 	[AX_CONFIG_FEATURE_ENABLE(dirfd)],
@@ -1019,18 +992,26 @@ AS_CASE([$host_cpu],
 
 AC_SUBST(ARCHTYPE)
 
+AS_CASE([$host_os],
+	[linux*], [OSTYPE="linux"],
+	[freebsd*], [OSTYPE="freebsd"],
+	[solaris*], [OSTYPE="solaris"],
+	[cygwin*], [OSTYPE="cygwin"],
+	[mingw*], [OSTYPE="mingw"],
+	[OSTYPE="unknown"]
+)
+AC_SUBST(OSTYPE)
+AM_CONDITIONAL([IS_LINUX], [test $OSTYPE = "linux"])
+
+
+
+# Userspace callstack capture is only supported by the Linux kernel on x86.
 AH_TEMPLATE([HAVE_MODULES_USERSPACE_CALLSTACK_CONTEXT], [Define if you have LTTng-modules userspace callstack tracing support])
-AC_MSG_CHECKING([for architecture support of userspace callstack tracing from the kernel])
-AS_IF([test "x$ARCHTYPE" = "xx86"],[
-        # Userspace callstack capture is only supported by the Linux kernel on x86.
-        AC_MSG_RESULT([yes])
+AS_IF([test "x$ARCHTYPE" = "xx86" && test "x$OSTYPE" = "xlinux"],[
         have_modules_userspace_callstack_context=yes
         AC_DEFINE([HAVE_MODULES_USERSPACE_CALLSTACK_CONTEXT], [1])
-], [
-        AC_MSG_RESULT([no])
-        have_modules_userspace_callstack_context=no
 ])
-AM_CONDITIONAL([HAVE_MODULES_USERSPACE_CALLSTACK_CONTEXT], [test x$have_modules_userspace_callstack_context != xno])
+AM_CONDITIONAL([HAVE_MODULES_USERSPACE_CALLSTACK_CONTEXT], [test x$have_modules_userspace_callstack_context = xyes])
 
 # Export binaries build conditions.
 AM_CONDITIONAL([BUILD_BIN_LTTNG], [test x$enable_bin_lttng != xno])