X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=9527af2842fe838cb2dea1b7706a9738d65ea788;hp=ffd54e2e6a7b017ed66b76ee74aff7dbfde748f8;hb=6bd8707a9f610a6214a90047781e52fdbb13fb48;hpb=6991b1817066a4a0a618f85adfdfb9aa8f2bd524

diff --git a/configure.ac b/configure.ac
index ffd54e2e6..9527af284 100644
--- 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.0],[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]]),
@@ -147,6 +171,9 @@ lttngincludedir="${includedir}/lttng"
 AC_SUBST(lttngincludedir)
 AC_SUBST(DEFAULT_INCLUDES)
 
+lttnglibexecdir="${libdir}/lttng/libexec"
+AC_SUBST(lttnglibexecdir)
+
 AC_CONFIG_FILES([
 	Makefile
 	doc/Makefile
@@ -159,6 +186,7 @@ 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
@@ -166,8 +194,13 @@ AC_CONFIG_FILES([
 	src/bin/lttng-sessiond/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
 ])
 
 AC_OUTPUT
@@ -177,6 +210,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
 [
@@ -219,7 +257,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")
@@ -234,7 +272,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")