X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=32d69d512de6243e0e70ece5c3c9fab0d5d8695c;hb=4925438891788d3abc0520fd3d09d3f4003d992d;hp=1add5d63d837898bbf45b23528d26cfac5e7c728;hpb=e654ae79ae3e812fa3770cfacfc8f46f93c4a769;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 1add5d63..32d69d51 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], [rc1]) +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], [[Joannès]]) -m4_define([V_DESC], [[Berliner Weisse style beer from the Trèfle Noir microbrewery in Rouyn-Noranda.]]) +m4_define([V_DESC], [[Berliner Weisse style beer from the Trèfle Noir microbrewery in Rouyn-Noranda. It is a tangy beer with a distinct pink dress and intense fruit flavor, thanks to the presence of fresh blackcurrant grown in Témiscamingue.]]) 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"])