X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=a0f0bad1619f7b08640afada7bf4e74050f4c5fb;hp=f98c874a660520cb76537d118fb33e411f7a79e5;hb=ca2eb7f43cf00d12f563905d741a6789c3d130ee;hpb=734f79bf717d87817623d382c59086dc9e8ef610

diff --git a/configure.ac b/configure.ac
index f98c874a6..a0f0bad16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,4 +1,4 @@
-AC_INIT([lttng-tools],[2.0-pre17],[dgoulet@efficios.com],[],[http://lttng.org])
+AC_INIT([lttng-tools],[2.0.0-rc2],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
@@ -14,6 +14,22 @@ AC_CHECK_HEADERS([ \
 	getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
 ])
 
+# Babeltrace viewer check
+AC_ARG_WITH([babeltrace-bin],
+	AS_HELP_STRING([--with-babeltrace-bin],
+	[Location of the babeltrace viewer executable (including the filename)]),
+	[BABELTRACE_BIN="$withval"],
+	[BABELTRACE_BIN=''])
+AC_SUBST([BABELTRACE_BIN])
+
+# lttv-gui
+AC_ARG_WITH([lttv-gui-bin],
+	AS_HELP_STRING([--with-lttv-gui-bin],
+   [Location of the lttv GUI viewer executable (including the filename)]),
+   [LTTV_GUI_BIN="$withval"],
+   [LTTV_GUI_BIN=''])
+AC_SUBST([LTTV_GUI_BIN])
+
 AC_ARG_WITH([consumerd32-bin],
 	AS_HELP_STRING([--with-consumerd32-bin],
 	[Location of the 32-bit consumerd executable (including the filename)]),
@@ -35,7 +51,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"],
@@ -46,6 +62,8 @@ AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_BIN], "$CONSUMERD32_BIN", [Location of th
 AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_BIN], "$CONSUMERD64_BIN", [Location of the 64-bit consumerd executable])
 AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_LIBDIR], "$CONSUMERD32_LIBDIR", [Search for consumerd 32-bit libraries in this location.])
 AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_LIBDIR], "$CONSUMERD64_LIBDIR", [Search for consumerd 64-bit libraries in this location.])
+AC_DEFINE_UNQUOTED([CONFIG_BABELTRACE_BIN], "$BABELTRACE_BIN", [Location of the babeltrace viewer executable.])
+AC_DEFINE_UNQUOTED([CONFIG_LTTV_GUI_BIN], "$LTTV_GUI_BIN", [Location of the lttv GUI viewer executable.])
 
 # Check for pthread
 AC_CHECK_LIB([pthread], [pthread_create], [],
@@ -98,6 +116,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]]),
@@ -122,7 +158,7 @@ LT_INIT
 
 CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
 
-DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir)"
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir) -I\$(top_builddir)/src -I\$(top_builddir)/include"
 
 lttngincludedir="${includedir}/lttng"
 
@@ -131,22 +167,25 @@ AC_SUBST(DEFAULT_INCLUDES)
 
 AC_CONFIG_FILES([
 	Makefile
+	doc/Makefile
+	doc/man/Makefile
 	include/Makefile
-	common/Makefile
-	libkernelctl/Makefile
-	liblttng-consumer/Makefile
-	liblttng-kconsumer/Makefile
-	liblttng-ustconsumer/Makefile
-	liblttngctl/Makefile
-	liblttng-sessiond-comm/Makefile
-	liblttng-ht/Makefile
-	lttng-consumerd/Makefile
-	lttng-sessiond/Makefile
-	lttng/Makefile
+	src/Makefile
+	src/common/Makefile
+	src/common/kernel-ctl/Makefile
+	src/common/kernel-consumer/Makefile
+	src/common/ust-consumer/Makefile
+	src/common/hashtable/Makefile
+	src/common/sessiond-comm/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/Makefile
 	tests/Makefile
 	tests/ust-nevents/Makefile
 	tests/ust-nprocesses/Makefile
-	doc/Makefile
 ])
 
 AC_OUTPUT