-AC_INIT([lttng-tools],[2.0-pre16],[david.goulet@polymtl.ca],[],[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
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([ \
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)]),
[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_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], [],
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"])
+
+# Check for fmemopen
+AC_CHECK_LIB([c], [fmemopen],
+[
+ AC_DEFINE_UNQUOTED([LTTNG_HAVE_FMEMOPEN], 1, [Has fmemopen support.])
+]
+)
+
+# Check for open_memstream
+AC_CHECK_LIB([c], [open_memstream],
+[
+ AC_DEFINE_UNQUOTED([LTTNG_HAVE_OPEN_MEMSTREAM], 1, [Has open_memstream support.])
+]
+)
+
# 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]]),
)
AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
+AC_SYS_LARGEFILE
AC_PROG_CC
LT_INIT
+AC_PROG_YACC
+AC_PROG_LEX
+
+AC_DEFUN([AC_PROG_BISON], [AC_CHECK_PROGS(BISON, bison, bison)])
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 -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
- 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/common/compat/Makefile
+ src/common/relayd/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
- doc/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
#
AS_ECHO()
+AS_ECHO("Version name: $version_name")
+AS_ECHO("$version_description")
+
+AS_ECHO()
+
# Target architecture we're building for
target_arch=$host_cpu
[
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")
projects / lttng-tools.git / blobdiff