X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=b48f91d1d3fc41ace813105766f30b5df787eef7;hb=db4a4c8735164155d64c87b80e6bee0f284fa652;hp=6850489a5185f709d8b087ee4c526f93f21338df;hpb=cfeef37a815d520888bd5a3435401b2bb3315fbd;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 6850489a..b48f91d1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4,8 +4,8 @@ dnl Process this file with autoconf to produce a configure script.
 dnl Version infos
 m4_define([V_MAJOR], [2])
 m4_define([V_MINOR], [8])
-m4_define([V_PATCH], [0])
-m4_define([V_EXTRA], [rc1])
+m4_define([V_PATCH], [4])
+dnl m4_define([V_EXTRA], [])
 m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
 m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])])
 m4_define([V_NAME], [[Isseki Nicho]])
@@ -33,6 +33,8 @@ AM_MAINTAINER_MODE([enable])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
 
+AC_REQUIRE_AUX_FILE([tap-driver.sh])
+
 # Configuration options, which will be installed in the config.h
 AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h])
 AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
@@ -169,8 +171,6 @@ dnl AC_CHECK_TYPES([ptrdiff_t])
 AC_FUNC_MALLOC
 AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf])
 
-CFLAGS="-Wall $CFLAGS"
-
 # URCU
 
 # urcu - check if we just find the headers it out of the box.
@@ -234,7 +234,7 @@ AS_CASE([$host_cpu],
 	[s390], [NO_UNALIGNED_ACCESS=1],
 	[s390x], [NO_UNALIGNED_ACCESS=1],
 	[arm*], [NO_UNALIGNED_ACCESS=1],
-	[aarch64], [NO_UNALIGNED_ACCESS=1],
+	[aarch64*], [NO_UNALIGNED_ACCESS=1],
 	[mips*], [NO_UNALIGNED_ACCESS=1],
 	[tile*], [NO_UNALIGNED_ACCESS=1],
 	[
@@ -295,10 +295,13 @@ AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || te
 	AX_JNI_INCLUDE_DIR
 	for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS
 	do
-		CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR"
+		JNI_CPPFLAGS="$JNI_CPPFLAGS -I$JNI_INCLUDE_DIR"
 	done
 
+	saved_CPPFLAGS="$CPPFLAGS"
+	CPPFLAGS="$CPPFLAGS $JNI_CPPFLAGS"
 	AX_PROG_JAVAH
+	CPPFLAGS="$saved_CPPFLAGS"
 ])
 
 AS_IF([test "x$java_agent_log4j" = "xyes"], [
@@ -424,6 +427,19 @@ and installing the man pages.
 AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"])
 AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"])
 
+# Default values
+AC_DEFUN([_AC_DEFINE_AND_SUBST], [
+	AC_DEFINE_UNQUOTED([CONFIG_$1], [$2], [$1])
+	$1="$2"
+	AC_SUBST([$1])
+])
+
+_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
+
+AM_CFLAGS="-Wall"
+AC_SUBST(AM_CFLAGS)
+AC_SUBST(JNI_CPPFLAGS)
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
@@ -441,6 +457,7 @@ AC_CONFIG_FILES([
 	liblttng-ust-java/Makefile
 	liblttng-ust-java-agent/Makefile
 	liblttng-ust-java-agent/java/Makefile
+	liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile
 	liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile
 	liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile
 	liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile
@@ -465,6 +482,7 @@ AC_CONFIG_FILES([
 	tests/benchmark/Makefile
 	tests/utils/Makefile
 	tests/test-app-ctx/Makefile
+	tests/gcc-weak-hidden/Makefile
 	lttng-ust.pc
 ])