X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=e5ac32003a265f7af970bb699db2b31ff415f4db;hb=3336564f68cb964478db684e5e70815fc179e97b;hp=15fb68057ba3dbf27376d6612e3aea7bb74cd171;hpb=fb54defd7e47e106bdf3b7eb07d53f0aba0525ec;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 15fb6805..e5ac3200 100644
--- a/configure.ac
+++ b/configure.ac
@@ -9,7 +9,7 @@ m4_define([V_DESC], [[Description TBD]])
 m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
 m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])])
 
-AC_PREREQ(2.59)
+AC_PREREQ([2.69])
 AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com], [], [https://lttng.org])
 
 dnl Substitute minor/major/patchlevel version numbers
@@ -41,13 +41,11 @@ AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 
-AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc])
+AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc -Wall -Wno-portability -Werror])
 AM_MAINTAINER_MODE([enable])
 
-# Enable silent rules if available (Introduced in AM 1.11)
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-AC_REQUIRE_AUX_FILE([tap-driver.sh])
+# Enable silent rules by default
+AM_SILENT_RULES([yes])
 
 # Checks for C compiler
 AC_USE_SYSTEM_EXTENSIONS
@@ -160,6 +158,7 @@ AC_CHECK_FUNCS([ \
 	strdup \
 	strerror \
 	strtol \
+	strtoul \
 	sysconf \
 ])
 
@@ -242,7 +241,6 @@ AC_CHECK_LIB([$libdl_name], [dlmopen],
 AC_CHECK_HEADER([dlfcn.h])
 AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], [
 	AC_CHECK_DECLS([RTLD_DI_LINKMAP], [], [], [
-		#define _GNU_SOURCE /* Required on Linux to get GNU extensions */
 		#include <dlfcn.h>
 	])
 ], [
@@ -251,48 +249,10 @@ AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], [
 
 AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"])
 
-# URCU
-
-AC_MSG_CHECKING([DEFINE_URCU_TLS_INIT()])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-	#include <urcu/tls-compat.h>
-	DEFINE_URCU_TLS_INIT(int, a, 1);
-]])], [
-	AC_MSG_RESULT([yes])
-], [
-	AC_MSG_RESULT([no])
-	AC_MSG_ERROR([Please upgrade your version of liburcu to 0.12.0 or better])
-])
-
-# urcu - check if we just find the headers it out of the box.
-AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CPPFLAGS]=-Idir to specify their location.
-This error can also occur when the liburcu package's configure script has not been run.])])
-
-# urcu-cds - check that URCU Concurrent Data Structure lib is available to compilation
-# Part of Userspace RCU library 0.7.2 or better.
-AC_CHECK_LIB([urcu-cds], [_cds_lfht_new], [], [AC_MSG_ERROR([Cannot find
-liburcu-cds lib, part of Userspace RCU 0.7 or better. Use [LDFLAGS]=-Ldir to specify its location.])])
-
-AC_MSG_CHECKING([caa_likely()])
-AC_COMPILE_IFELSE([AC_LANG_SOURCE([[
-	#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], [urcu_bp_synchronize_rcu], [], [AC_MSG_ERROR([Cannot find liburcu-bp 0.11 or newer. Use [LDFLAGS]=-Ldir to specify its location.])])
-
-# urcu - check that URCU lib is at least version 0.11
-AC_CHECK_LIB([urcu-bp], [urcu_bp_call_rcu], [], [AC_MSG_ERROR([liburcu 0.11 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])])
+# Require URCU >= 0.12 for DEFINE_URCU_TLS_INIT
+PKG_CHECK_MODULES([URCU], [liburcu >= 0.12])
+PKG_CHECK_MODULES([URCU_BP], [liburcu-bp >= 0.12])
+PKG_CHECK_MODULES([URCU_CDS], [liburcu-cds >= 0.12])
 
 # numa.h integration
 AS_IF([test "x$NO_NUMA" = "x1"],[
@@ -522,9 +482,12 @@ AC_DEFUN([_AC_DEFINE_AND_SUBST], [
 
 _AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
 
-AM_CFLAGS="-Wall $PTHREAD_CFLAGS"
+AM_CFLAGS="-Wall $URCU_CFLAGS $PTHREAD_CFLAGS"
 AC_SUBST(AM_CFLAGS)
 
+AM_CXXFLAGS="$AM_CFLAGS"
+AC_SUBST(AM_CXXFLAGS)
+
 # The order in which the include folders are searched is important.
 # The top_builddir should always be searched first in the event that a build
 # time generated file is included.
@@ -541,6 +504,8 @@ AC_CONFIG_FILES([
 	include/Makefile
 	include/lttng/ust-version.h
 	snprintf/Makefile
+	libcounter/Makefile
+	libmsgpack/Makefile
 	libringbuffer/Makefile
 	liblttng-ust-comm/Makefile
 	liblttng-ust/Makefile
@@ -567,17 +532,22 @@ AC_CONFIG_FILES([
 	python-lttngust/lttngust/__init__.py
 	tools/Makefile
 	tests/Makefile
-	tests/ctf-types/Makefile
-	tests/hello/Makefile
-	tests/hello-many/Makefile
-	tests/hello.cxx/Makefile
-	tests/same_line_tracepoint/Makefile
-	tests/snprintf/Makefile
-	tests/ust-elf/Makefile
+	tests/compile/Makefile
+	tests/compile/ctf-types/Makefile
+	tests/compile/hello.cxx/Makefile
+	tests/compile/hello/Makefile
+	tests/compile/hello-many/Makefile
+	tests/compile/same_line_tracepoint/Makefile
+	tests/compile/test-app-ctx/Makefile
 	tests/benchmark/Makefile
+	tests/unit/gcc-weak-hidden/Makefile
+	tests/unit/libmsgpack/Makefile
+	tests/unit/Makefile
+	tests/unit/libringbuffer/Makefile
+	tests/unit/pthread_name/Makefile
+	tests/unit/snprintf/Makefile
+	tests/unit/ust-elf/Makefile
 	tests/utils/Makefile
-	tests/test-app-ctx/Makefile
-	tests/gcc-weak-hidden/Makefile
 	lttng-ust.pc
 	lttng-ust-ctl.pc
 ])
@@ -591,7 +561,7 @@ AC_CONFIG_LINKS([
 	python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py
 ])
 
-AC_CONFIG_FILES([tests/ust-elf/test_ust_elf],[chmod +x tests/ust-elf/test_ust_elf])
+AC_CONFIG_FILES([tests/unit/ust-elf/test_ust_elf],[chmod +x tests/unit/ust-elf/test_ust_elf])
 
 AC_OUTPUT