X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=939cf3458b0a9ed2bdd81371061376ba752f4696;hb=refs%2Fheads%2Fstable-2.4;hp=7a1e7307a76bc75bdb4c4db83ba0fb42128e8240;hpb=d516ed242f9ade370fd0911f04cefa93caebe2dc;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 7a1e7307..939cf345 100644
--- 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.4.0-rc2],[mathieu dot desnoyers at efficios dot com])
+AC_INIT([lttng-ust],[2.4.4],[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
@@ -103,6 +103,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],
 [
@@ -123,6 +130,16 @@ AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"])
 
 AC_CHECK_LIB([pthread], [pthread_create])
 
+# Check for dlfcn.h
+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>])
+	],
+	[ac_cv_have_decl_RTLD_DI_LINKMAP="no"])
+AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"])
+
 # Checks for header files.
 #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
 
@@ -198,6 +215,7 @@ changequote([,])dnl
 	tile*) NO_UNALIGNED_ACCESS=1 ;;
 	*) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;;
 esac
+AC_MSG_RESULT([$host_cpu])
 
 if test x$NO_UNALIGNED_ACCESS = x ; then
 AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
@@ -235,7 +253,7 @@ AS_IF([test "x$jni_interface" = "xyes"],[
         AC_CHECK_HEADERS([jni.h],[],[
         AC_MSG_ERROR([missing jni.h
 Make sure Sun Java, OpenJDK or GCJ is installed and that this header file exists in the system path.
-Use the --with-java-jdk=DIR flag to point to your Java include files, or disable the JNI interface.])
+Use the --with-java-jdk=DIR option to point to your JDK directory, or disable the JNI interface.])
 	])
 ])
 AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"])
@@ -265,6 +283,16 @@ AS_IF([test "x$with_sdt" = "xyes"],[
 	])
 ])
 
+AC_MSG_CHECKING([whether shared libraries are enabled])
+AS_IF([test "x$enable_shared" = "xyes"],
+	[
+		AC_MSG_RESULT([yes])
+	],
+	[
+		AC_MSG_RESULT([no])
+		AC_MSG_ERROR([LTTng-UST requires shared libraries to be enabled])
+	])
+
 AC_ARG_WITH([lttng-system-rundir],
 	AS_HELP_STRING([--with-lttng-system-rundir],
 	[Location of the system directory where LTTng-UST expects the system-wide lttng-sessiond runtime files. The default is "/var/run/lttng".]),
@@ -276,6 +304,9 @@ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"],
 lttnglibjavadir="${libdir}/lttng/java"
 AC_SUBST(lttnglibjavadir)
 
+AM_PATH_PYTHON([2.7],BUILD_GEN_TP_EXAMPLES=1,[:])
+AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test $BUILD_GEN_TP_EXAMPLES], [Build examples requiring lttng-gen-tp])
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile