-AC_INIT([lttng-tools],[2.0-pre20],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.0.0-rc3],[dgoulet@efficios.com],[],[http://lttng.org])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
[CONSUMERD32_LIBDIR=''])
AC_SUBST([CONSUMERD32_LIBDIR])
-AC_ARG_WITH([consumer64d-libdir],
+AC_ARG_WITH([consumerd64-libdir],
AS_HELP_STRING([--with-consumerd64-libdir],
[Directory containing the 64-bit consumerd libraries]),
[CONSUMERD64_LIBDIR="$withval"],
AC_CHECK_FUNCS([sched_getcpu sysconf])
+# check for dlopen
+AC_CHECK_LIB([dl], [dlopen],
+[
+ have_libdl=yes
+],
+[
+ #libdl not found, check for dlopen in libc.
+ AC_CHECK_LIB([c], [dlopen],
+ [
+ have_libc_dl=yes
+ ],
+ [
+ AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.])
+ ])
+])
+AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"])
+AM_CONDITIONAL([LTTNG_TOOLS_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"])
+
# Option to only build the consumer daemon and its libraries
AC_ARG_WITH([consumerd-only],
AS_HELP_STRING([--with-consumerd-only],[Only build the consumer daemon [default=no]]),
AC_SUBST(lttngincludedir)
AC_SUBST(DEFAULT_INCLUDES)
+lttnglibexecdir="${libdir}/lttng/libexec"
+AC_SUBST(lttnglibexecdir)
+
AC_CONFIG_FILES([
Makefile
doc/Makefile
src/common/ust-consumer/Makefile
src/common/hashtable/Makefile
src/common/sessiond-comm/Makefile
+ src/common/compat/Makefile
src/lib/Makefile
src/lib/lttng-ctl/Makefile
src/bin/Makefile
AS_ECHO("The sessiond daemon will look in the following directories: ")
AS_ECHO_N("32-bit consumerd executable at: ")
AS_IF([test "$CONSUMERD32_BIN" = ""],[
- AS_ECHO_N("`eval eval echo $bindir`")
+ AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
AS_ECHO("/lttng-consumerd")
],[
AS_ECHO("$CONSUMERD32_BIN")
AS_ECHO_N("64-bit consumerd executable at: ")
AS_IF([test "$CONSUMERD64_BIN" = ""],[
- AS_ECHO_N("`eval eval echo $bindir`")
+ AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
AS_ECHO("/lttng-consumerd")
],[
AS_ECHO("$CONSUMERD64_BIN")