Initial import of the new binary lttng-relayd

[lttng-tools.git] / configure.ac

diff --git a/configure.ac b/configure.ac
index f9a16664ea547ecaee37ff6e15103580fb129d73..7f4912321a2ffb57d2a0b46ec99d81a46fa41668 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.0-pre20],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.0.1],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -6,6 +6,12 @@ AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
+version_name="Annedd'ale"
+version_description="New type of beer, 100% from Quebec, flavored with sapin beaumier needles, with a touch of hops."
+
+AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "")
+AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], "")
+
 AC_CONFIG_HEADERS([include/config.h])
 
 AC_CHECK_HEADERS([ \
@@ -51,7 +57,7 @@ AC_ARG_WITH([consumerd32-libdir],
        [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"],
@@ -116,6 +122,24 @@ AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl
 
 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]]),
@@ -135,21 +159,26 @@ AX_CONFIG_FEATURE(
 )
 AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
 
+AC_SYS_LARGEFILE
 AC_PROG_CC
 LT_INIT
 
 CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
 
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include"
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include -include config.h"
 
 lttngincludedir="${includedir}/lttng"
 
 AC_SUBST(lttngincludedir)
 AC_SUBST(DEFAULT_INCLUDES)
 
+lttnglibexecdir="${libdir}/lttng/libexec"
+AC_SUBST(lttnglibexecdir)
+
 AC_CONFIG_FILES([
        Makefile
        doc/Makefile
+       doc/man/Makefile
        include/Makefile
        src/Makefile
        src/common/Makefile
@@ -158,15 +187,23 @@ AC_CONFIG_FILES([
        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
        src/bin/lttng-consumerd/Makefile
        src/bin/lttng-sessiond/Makefile
+       src/bin/lttng-relayd/Makefile
        src/bin/lttng/Makefile
        tests/Makefile
-       tests/ust-nevents/Makefile
-       tests/ust-nprocesses/Makefile
+       tests/kernel/Makefile
+       tests/tools/Makefile
+       tests/ust/Makefile
+       tests/ust/nprocesses/Makefile
+       tests/ust/high-throughput/Makefile
+       tests/ust/low-throughput/Makefile
+       tests/ust/before-after/Makefile
+       tests/ust/multi-session/Makefile
 ])
 
 AC_OUTPUT
@@ -176,6 +213,11 @@ AC_OUTPUT
 #
 AS_ECHO()
 
+AS_ECHO("Version name: $version_name")
+AS_ECHO("$version_description")
+
+AS_ECHO()
+
 # Target architecture we're building for
 target_arch=$host_cpu
 [
@@ -218,7 +260,7 @@ AS_IF([test "x$consumerd_only" = "xno"],[
        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")
@@ -233,7 +275,7 @@ AS_IF([test "x$consumerd_only" = "xno"],[
 
        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")