X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=023cfd4e3811ac52b020bec794a948d2bbf681e3;hb=0b2253f5c9af73904d49da32085036c16b9d2d75;hp=82ea5dc2e26fc1ebc9d6102e29690277bc0f4f89;hpb=ebb9f8ffff8bf3a922073143bd16825140450b98;p=lttng-ust.git

diff --git a/configure.ac b/configure.ac
index 82ea5dc2..023cfd4e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5,11 +5,11 @@ dnl Version infos
 m4_define([V_MAJOR], [2])
 m4_define([V_MINOR], [9])
 m4_define([V_PATCH], [0])
-m4_define([V_EXTRA], [pre])
+m4_define([V_EXTRA], [rc1])
 m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH])
 m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])])
-m4_define([V_NAME], [[J-TBD]])
-m4_define([V_DESC], [[]])
+m4_define([V_NAME], [[Joannès]])
+m4_define([V_DESC], [[Berliner Weisse style beer from the Trèfle Noir microbrewery in Rouyn-Noranda.]])
 
 AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com])
 
@@ -125,15 +125,23 @@ AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [
 # Checks for libraries.
 AC_CHECK_LIB([dl], [dlopen], [
 	have_libdl=yes
+	libdl_name=dl
 ], [
 	#libdl not found, check for dlopen in libc.
 	AC_CHECK_LIB([c], [dlopen], [
 		have_libc_dl=yes
+		libdl_name=c
 	], [
 		AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.])
 	])
 ])
 
+# Check if libdl has dlmopen support.
+AH_TEMPLATE([HAVE_DLMOPEN], ["Define to 1 if dlmopen is available."])
+AC_CHECK_LIB([$libdl_name], [dlmopen],
+	[AC_DEFINE([HAVE_DLMOPEN], [1])]
+)
+
 AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"])
 AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"])
 
@@ -435,6 +443,8 @@ AC_DEFUN([_AC_DEFINE_AND_SUBST], [
 ])
 
 _AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
+# By default, do not retry on buffer full condition.
+_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_BLOCKING_RETRY_TIMEOUT_MS], [0])
 
 AC_CONFIG_FILES([
 	Makefile