X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=53f21ab098181b3e47f8aaa7c514e6a1a5f3fe49;hp=621f091fd9d57db8e9211a416181ac999f48e1d3;hb=fc256d995013fb0557601fd203531493e1dacff7;hpb=55bed2138489dd1bfc43726e0ce71f7d5ee6d62c diff --git a/configure.ac b/configure.ac index 621f091fd..53f21ab09 100644 --- a/configure.ac +++ b/configure.ac @@ -1,4 +1,4 @@ -AC_INIT([lttng-tools],[2.0-pre14],[david.goulet@polymtl.ca],[],[http://lttng.org]) +AC_INIT([lttng-tools],[2.0-pre18],[dgoulet@efficios.com],[],[http://lttng.org]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST @@ -14,38 +14,38 @@ AC_CHECK_HEADERS([ \ getopt.h sys/ipc.h sys/shm.h popt.h grp.h \ ]) -AC_ARG_WITH([consumerd32-path], - AS_HELP_STRING([--with-consumerd32-path], - [Location of the 32-bit consumerd executable]), - [CONSUMERD32_PATH="$withval"], - [CONSUMERD32_PATH='']) -AC_SUBST([CONSUMERD32_PATH]) +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-path], - AS_HELP_STRING([--with-consumerd64-path], - [Location of the 64-bit consumerd executable]), - [CONSUMERD64_PATH="$withval"], - [CONSUMERD64_PATH='']) -AC_SUBST([CONSUMERD64_PATH]) +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], - [Location of the 32-bit consumerd libraries]), + [Directory containing the 32-bit consumerd libraries]), [CONSUMERD32_LIBDIR="$withval"], [CONSUMERD32_LIBDIR='']) AC_SUBST([CONSUMERD32_LIBDIR]) AC_ARG_WITH([consumer64d-libdir], AS_HELP_STRING([--with-consumerd64-libdir], - [Location of the 64-bit consumerd libraries]), + [Directory containing the 64-bit consumerd libraries]), [CONSUMERD64_LIBDIR="$withval"], [CONSUMERD64_LIBDIR='']) AC_SUBST([CONSUMERD64_LIBDIR]) -AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD32_PATH], $CONSUMERD32_PATH, [Location of the 32-bit consumerd executable.]) -AC_DEFINE_UNQUOTED([CONFIG_CONSUMERD64_PATH], $CONSUMERD64_PATH, [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_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.]) # Check for pthread AC_CHECK_LIB([pthread], [pthread_create], [], @@ -58,7 +58,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], [], @@ -122,7 +122,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,34 +131,103 @@ AC_SUBST(DEFAULT_INCLUDES) AC_CONFIG_FILES([ Makefile + doc/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/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 - doc/Makefile + tests/ust-nevents/Makefile + tests/ust-nprocesses/Makefile ]) AC_OUTPUT +# # Mini-report on what will be built -AS_ECHO("") - +# +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")] -) +AS_IF([test "x$lttng_ust_support" = "xyes"],[ + AS_ECHO("Enabled") +],[ + AS_ECHO("Disabled") +]) -AS_IF([test "x$consumerd_only" = "xyes"], - [AS_ECHO("Only the consumerd daemon will be built.")], - [AS_ECHO("All binaries will be built.")] -) +# 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 $bindir`") + 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 $bindir`") + 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("") +AS_ECHO()