X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=af522eeb0677665d3d0899fc8f7a8c966927743e;hp=aa185a6db07b60144536483fbba46324c7772adc;hb=1fea938d0d3adc783bb49d7ff3d0686ba87b0520;hpb=e3f4dd29a5a67e0e0b3c36baedb71c4f7f23b795 diff --git a/configure.ac b/configure.ac index aa185a6db..af522eeb0 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-pre16],[david.goulet@polymtl.ca],[],[http://lttng.org]) AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST @@ -14,22 +14,38 @@ AC_CHECK_HEADERS([ \ getopt.h sys/ipc.h sys/shm.h popt.h grp.h \ ]) -AC_ARG_WITH([consumer32-bindir], - AC_HELP_STRING([--with-consumer32-bindir], - [Location of the 32-bit consumer executable]), - [LTTNG_TOOLS_32BIT_BINDIR="$withval"], - [LTTNG_TOOLS_32BIT_BINDIR='']) -AC_SUBST([LTTNG_TOOLS_32BIT_BINDIR]) - -AC_ARG_WITH([consumer64-bindir], - AC_HELP_STRING([--with-consumer64-bindir], - [Location of the 64-bit consumer executable]), - [LTTNG_TOOLS_64BIT_BINDIR="$withval"], - [LTTNG_TOOLS_64BIT_BINDIR='']) -AC_SUBST([LTTNG_TOOLS_64BIT_BINDIR]) - -AC_DEFINE_UNQUOTED([CONFIG_32BIT_BINDIR], $LTTNG_TOOLS_32BIT_BINDIR, [Search for LTTng Tools 32-bit binaries in this location.]) -AC_DEFINE_UNQUOTED([CONFIG_64BIT_BINDIR], $LTTNG_TOOLS_64BIT_BINDIR, [Search for LTTng Tools 64-bit binaries in this location.]) +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([consumer64d-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.]) # Check for pthread AC_CHECK_LIB([pthread], [pthread_create], [], @@ -42,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], [], @@ -69,26 +85,26 @@ 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 -] +AS_IF([test "x$lttng_ust_support" = "xyes"], [ 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.])] ) -[ - echo "LTTng-UST support enabled." -fi -] +]) AM_CONDITIONAL([HAVE_LIBLTTNG_UST_CTL], [ test "x$ac_cv_lib_lttng_ust_ctl_ustctl_create_session" = "xyes" ]) 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( [AX_CONFIG_FEATURE_ENABLE(epoll)], @@ -102,7 +118,7 @@ AX_CONFIG_FEATURE( AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ]) AC_PROG_CC -AC_PROG_LIBTOOL +LT_INIT CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing" @@ -116,17 +132,99 @@ AC_SUBST(DEFAULT_INCLUDES) AC_CONFIG_FILES([ 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 tests/Makefile + tests/ust-nevents/Makefile doc/Makefile ]) AC_OUTPUT + +# +# Mini-report on what will be built +# +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 $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() +