Fix: out of tree build of java agents

[lttng-ust.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index 4143a4e486036582271a0306316d67212027148f..03483a7720c0f2e7ea2449c494158c134a79d375 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,7 +1,7 @@
 #                                               -*- Autoconf -*-
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([lttng-ust],[2.6.0-rc1],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.7.0-pre],[mathieu dot desnoyers at efficios dot com])
 
 # Following the numbering scheme proposed by libtool for the library version
 # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html
@@ -41,13 +41,14 @@ AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [UST major version number])
 AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number])
 AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel version number])
 
-version_name="Fumisterie"
-version_description="The Fumisterie is a beer whose style is at the confluence of English and German ales. On the palate, it is full-bodied, malty and slightly caramelized. The organic hemp seeds incorporated during the brewing gives it a unique and original taste. The hop flavour comes through delicately in the after taste."
+version_name="Gaia"
+version_description="From Benelux brewery in Montreal, the Gaia is a witbier with a cloudy light amber ale color. Aroma of coriander with floral hay notes is enchanting. Taste is also dominated by the very floral coriander note and some medium sweet malt notes."
 
 AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name])
 AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description])
 
 AC_PROG_GREP
+AC_PROG_LN_S
 # libtool link_all_deplibs fixup. See http://bugs.lttng.org/issues/321.
 AC_ARG_ENABLE(libtool-linkdep-fixup,
        AS_HELP_STRING([--disable-libtool-linkdep-fixup],
@@ -105,6 +106,13 @@ AC_CACHE_CHECK([whether the C++ compiler works],
 
 AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"])
 
+# Check if the compiler support weak symbols
+AX_SYS_WEAK_ALIAS
+
+if test "x${ax_cv_sys_weak_alias}" = "xno"; then
+   AC_MSG_ERROR([Your platform doesn't support weak symbols.])
+fi
+
 ## Checks for libraries.
 AC_CHECK_LIB([dl], [dlopen],
 [
@@ -230,6 +238,7 @@ changequote([,])dnl
        s390) NO_UNALIGNED_ACCESS=1 ;;
        s390x) NO_UNALIGNED_ACCESS=1 ;;
         arm*) NO_UNALIGNED_ACCESS=1 ;;
+       aarch64) NO_UNALIGNED_ACCESS=1 ;;
        mips*) NO_UNALIGNED_ACCESS=1 ;;
        tile*) NO_UNALIGNED_ACCESS=1 ;;
        *) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;;
@@ -299,6 +308,14 @@ if test "x$java_agent_log4j" = "xyes"; then
   fi
 fi
 
+# Option to build the python agent
+AC_ARG_ENABLE([python-agent],
+       [AS_HELP_STRING([--enable-python-agent],[build the LTTng UST Python agent [default=no]])],
+    [python_agent=$enableval],
+       [:]
+)
+AM_CONDITIONAL([BUILD_PYTHON_AGENT], [test "x$python_agent" = "xyes"])
+
 # sdt.h integration
 AC_ARG_WITH([sdt],
        [AS_HELP_STRING([--with-sdt],[provide SystemTap integration via sdt.h [default=no]])],
@@ -366,6 +383,7 @@ AC_CONFIG_FILES([
        liblttng-ust-java-agent/jni/log4j/Makefile
        liblttng-ust-libc-wrapper/Makefile
        liblttng-ust-cyg-profile/Makefile
+       liblttng-ust-python-agent/Makefile
        tools/Makefile
        tests/Makefile
        tests/hello/Makefile
@@ -398,6 +416,9 @@ AS_IF([test "x$java_agent_log4j" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disa
 AS_ECHO_N("JNI interface (JNI): ")
 AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
 
+AS_ECHO_N("Python agent: ")
+AS_IF([test "x$python_agent" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])
+
 AS_ECHO_N("sdt.h integration:  ")
 AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")])