Update version to v2.1.0-rc2
[lttng-tools.git] / configure.ac
index 8c0eb54d345d6561281793d01f5012cc5db4243e..94f571be38b23d6d0de911f6af9464857a895787 100644 (file)
-AC_INIT([lttng-tools], [2.0-pre14], [david.goulet@polymtl.ca], ,[http://lttng.org])
+AC_INIT([lttng-tools],[2.1.0-rc2],[dgoulet@efficios.com],[],[http://lttng.org])
 AC_CONFIG_AUX_DIR([config])
 AC_CANONICAL_TARGET
 AC_CANONICAL_HOST
 AC_CONFIG_MACRO_DIR([config])
 AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip])
-AM_SILENT_RULES([yes])
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
+
+version_name="Basse Messe"
+version_description="Light coloured German ale whose style was named after the city Cologne (Koln) where it was first brewed. It is a rather simple beer with lightly fruity aromas and a delicate hoppy fragrance. The beer has a pronounced malty taste with a subtle bitter aftertaste"
+
+AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "")
+AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], "")
 
 AC_CONFIG_HEADERS([include/config.h])
 
+AC_PROG_GREP
+# libtool link_all_deplibs fixup. See http://bugs.lttng.org/issues/321.
+AC_ARG_ENABLE(libtool-linkdep-fixup,
+       AS_HELP_STRING([--disable-libtool-linkdep-fixup],
+                       [disable the libtool fixup for linking all dependent libraries (link_all_deplibs)]),
+       libtool_fixup=$enableval,
+       libtool_fixup=yes)
+
+AS_IF([test "x$libtool_fixup" = "xyes"],
+           [
+           libtool_m4="$srcdir/config/libtool.m4"
+           libtool_flag_pattern=".*link_all_deplibs\s*,\s*\$1\s*)"
+           AC_MSG_CHECKING([for occurence(s) of link_all_deplibs = no in $libtool_m4])
+           libtool_flag_pattern_count=$(grep -c "$libtool_flag_pattern\s*=\s*no" $libtool_m4)
+           AS_IF([test $libtool_flag_pattern_count -ne 0],
+           [
+                 AC_MSG_RESULT([$libtool_flag_pattern_count])
+                 AC_MSG_WARN([the detected libtool will not link all dependencies, forcing link_all_deplibs = unknown])
+                 sed -i "s/\($libtool_flag_pattern\)\s*=\s*no/\1=unknown/g" $libtool_m4
+                 ],
+                 [
+                 AC_MSG_RESULT([none])
+                 ])
+           ])
+
 AC_CHECK_HEADERS([ \
        sys/types.h unistd.h fcntl.h string.h pthread.h limits.h \
        signal.h stdlib.h sys/un.h sys/socket.h stdlib.h stdio.h \
        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_BIN="$withval"],
+       [CONSUMERD32_BIN=''])
+AC_SUBST([CONSUMERD32_BIN])
+
+AC_ARG_WITH([consumerd64-bin],
+       AS_HELP_STRING([--with-consumerd64-bin],
+       [Location of the 64-bit consumerd executable (including the filename)]),
+       [CONSUMERD64_BIN="$withval"],
+       [CONSUMERD64_BIN=''])
+AC_SUBST([CONSUMERD64_BIN])
+
+AC_ARG_WITH([consumerd32-libdir],
+       AS_HELP_STRING([--with-consumerd32-libdir],
+       [Directory containing the 32-bit consumerd libraries]),
+       [CONSUMERD32_LIBDIR="$withval"],
+       [CONSUMERD32_LIBDIR=''])
+AC_SUBST([CONSUMERD32_LIBDIR])
+
+AC_ARG_WITH([consumerd64-libdir],
+       AS_HELP_STRING([--with-consumerd64-libdir],
+       [Directory containing the 64-bit consumerd libraries]),
+       [CONSUMERD64_LIBDIR="$withval"],
+       [CONSUMERD64_LIBDIR=''])
+AC_SUBST([CONSUMERD64_LIBDIR])
+
+AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_BIN], "$CONSUMERD32_BIN", [Location of the 32-bit consumerd executable.])
+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_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]
@@ -25,7 +107,7 @@ AC_CHECK_LIB([popt], [poptGetContext], [],
 )
 
 # URCU library version needed or newer
-liburcu_version=">= 0.6.6"
+liburcu_version=">= 0.6.7"
 
 # Check liburcu needed function calls
 AC_CHECK_DECL([cds_list_add], [],
@@ -34,6 +116,9 @@ AC_CHECK_DECL([cds_list_add], [],
 AC_CHECK_DECL([cds_wfq_init], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
 )
+AC_CHECK_DECL([cds_wfq_dequeue_blocking], [],
+    [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
+)
 AC_CHECK_DECL([futex_async], [],
        [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]
 )
@@ -49,25 +134,60 @@ AC_CHECK_DECL([caa_likely], [],
 
 # Check liblttng-ust-ctl library
 AC_ARG_ENABLE(lttng-ust,
-       [  --disable-lttng-ust     build without LTTng-UST (Userspace Tracing) support.],
-       lttng_ust_support=no, lttng_ust_support=yes)
+       AS_HELP_STRING([--disable-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]),
+       lttng_ust_support=$enableval, lttng_ust_support=yes)
 
-[
-if test "x$lttng_ust_support" = "xno"; then
-       echo "LTTng-UST support disabled."
-else
-]
-       AC_CHECK_LIB([lttng-ust-ctl], [ustctl_create_session], [],
-               [AC_MSG_ERROR([Cannot find LTTng-UST. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])]
+AS_IF([test "x$lttng_ust_support" = "xyes"], [
+       AC_CHECK_LIB([lttng-ust-ctl], [ustctl_set_filter],
+               [
+                       AC_DEFINE([HAVE_LIBLTTNG_UST_CTL], [1], [has LTTng-UST control support])
+                       lttng_ust_ctl_found=yes
+               ],
+               [AC_MSG_ERROR([Cannot find LTTng-UST. Use [LDFLAGS]=-Ldir to specify its location, or specify --disable-lttng-ust to build lttng-tools without LTTng-UST support.])],
+               [-lurcu-common -lurcu-bp -lurcu-cds]
        )
+])
+AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [test "x$lttng_ust_ctl_found" = xyes])
+AC_CHECK_FUNCS([sched_getcpu sysconf])
+
+# check for dlopen
+AC_CHECK_LIB([dl], [dlopen],
+[
+       have_libdl=yes
+],
 [
-       echo "LTTng-UST support enabled."
-fi
+       #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.])
 ]
+)
 
-AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ])
+# Check for open_memstream
+AC_CHECK_LIB([c], [open_memstream],
+[
+       AC_DEFINE_UNQUOTED([LTTNG_HAVE_OPEN_MEMSTREAM], 1, [Has open_memstream support.])
+]
+)
 
-AC_CHECK_FUNCS([sched_getcpu sysconf])
+# 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]]),
+       [consumerd_only=$withval],
+       [consumerd_only=no])
+AM_CONDITIONAL([BUILD_CONSUMERD_ONLY], [test "x$consumerd_only" = "xyes"])
 
 # Epoll check. If not present, the build will fallback on poll() API
 AX_HAVE_EPOLL(
@@ -81,32 +201,141 @@ AX_CONFIG_FEATURE(
 )
 AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
 
+AC_SYS_LARGEFILE
 AC_PROG_CC
-AC_PROG_LIBTOOL
+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
-       libkernelctl/Makefile
-       liblttng-consumer/Makefile
-       liblttng-kconsumer/Makefile
-       liblttng-ustconsumer/Makefile
-       liblttngctl/Makefile
-       liblttng-sessiond-comm/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/tools/streaming/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
+
+#
+# Mini-report on what will be built
+#
+AS_ECHO()
+
+AS_ECHO("Version name: $version_name")
+AS_ECHO("$version_description")
+
+AS_ECHO()
+
+# Target architecture we're building for
+target_arch=$host_cpu
+[
+for f in $CFLAGS; do
+        if test $f = "-m32"; then
+                       target_arch="32-bit"
+        elif test $f = "-m64"; then
+                       target_arch="64-bit"
+        fi
+done
+]
+AS_ECHO_N("Target architecture: ")
+AS_ECHO($target_arch)
+
+# LTTng-UST enabled/disabled
+AS_ECHO_N("Lttng-UST support: ")
+AS_IF([test "x$lttng_ust_support" = "xyes"],[
+       AS_ECHO("Enabled")
+],[
+       AS_ECHO("Disabled")
+])
+
+# Do we build only the consumerd, or everything
+AS_IF([test "x$consumerd_only" = "xyes"],[
+       AS_ECHO("Only the consumerd daemon will be built.")
+],[
+       AS_ECHO("All binaries will be built.")
+])
+
+# Print the bindir and libdir this `make install' will install into.
+AS_ECHO()
+AS_ECHO_N("Binaries will be installed in:  ")
+AS_ECHO("`eval eval echo $bindir`")
+AS_ECHO_N("Libraries will be installed in: ")
+AS_ECHO("`eval eval echo $libdir`")
+
+# If we build the sessiond, print the paths it will use
+AS_IF([test "x$consumerd_only" = "xno"],[
+       AS_ECHO()
+       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 $lttnglibexecdir`")
+               AS_ECHO("/lttng-consumerd")
+       ],[
+               AS_ECHO("$CONSUMERD32_BIN")
+       ])
+
+       AS_ECHO_N("32-bit consumer libraries in:   ")
+       AS_IF([test "$CONSUMERD32_LIBDIR" = ""],[
+               AS_ECHO("`eval eval echo $libdir`")
+       ],[
+               AS_ECHO("$CONSUMERD32_LIBDIR")
+       ])
+
+       AS_ECHO_N("64-bit consumerd executable at: ")
+       AS_IF([test "$CONSUMERD64_BIN" = ""],[
+               AS_ECHO_N("`eval eval echo $lttnglibexecdir`")
+               AS_ECHO("/lttng-consumerd")
+       ],[
+               AS_ECHO("$CONSUMERD64_BIN")
+       ])
+
+       AS_ECHO_N("64-bit consumer libraries in:   ")
+       AS_IF([test "$CONSUMERD64_LIBDIR" = ""],[
+               AS_ECHO("`eval eval echo $libdir`")
+       ],[
+               AS_ECHO("$CONSUMERD64_LIBDIR")
+       ])
+])
+
+AS_ECHO()
+
This page took 0.026084 seconds and 4 git commands to generate.