X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=configure.ac;h=10a534c36331f4a6bd19659a0d52ddfbff525671;hp=4cefd8c90e8944c399f2123cd528f20b16d8596c;hb=193c46de9d0a53a5d07ea7ff07aa9162afa0508c;hpb=18ecc6aedf929c6aeba25aa1f1c06d246f349c2b diff --git a/configure.ac b/configure.ac index 4cefd8c90..10a534c36 100644 --- a/configure.ac +++ b/configure.ac @@ -1,15 +1,61 @@ AC_PREREQ([2.64]) AC_INIT([lttng-tools],[2.8.0-pre],[jeremie.galarneau@efficios.com],[],[https://lttng.org]) + +AC_CONFIG_HEADERS([include/config.h]) AC_CONFIG_AUX_DIR([config]) +AC_CONFIG_MACRO_DIR([m4]) + AC_CANONICAL_TARGET AC_CANONICAL_HOST -AC_CONFIG_MACRO_DIR([config]) -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) + +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip tar-pax]) AM_MAINTAINER_MODE([enable]) + +# Enable silent rules if available (Introduced in AM 1.11) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) -# Compute minor/major/patchlevel version numbers +# Checks for C compiler +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE +AC_PROG_CC +AC_PROG_CC_STDC + +# Checks for programs. +AC_PROG_GREP +AC_PROG_LEX +AC_PROG_MAKE_SET AC_PROG_SED +AC_PROG_YACC +LT_INIT + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_INLINE +AC_TYPE_INT32_T +AC_TYPE_INT64_T +AC_TYPE_MODE_T +AC_TYPE_OFF_T +AC_TYPE_PID_T +AC_TYPE_SIZE_T +AC_TYPE_SSIZE_T +AC_TYPE_UID_T +AC_TYPE_UINT16_T +AC_TYPE_UINT32_T +AC_TYPE_UINT64_T +AC_TYPE_UINT8_T + +AX_C___ATTRIBUTE__ +AS_IF([test "x$ax_cv___attribute__" = "xyes"], + [:], + [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])]) + +AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])]) +LIBS="$PTHREAD_LIBS $LIBS" +CFLAGS="$CFLAGS $PTHREAD_CFLAGS" +CC="$PTHREAD_CC" + +AX_LIB_SOCKET_NSL + +# Compute minor/major/patchlevel version numbers major_version=$(echo AC_PACKAGE_VERSION | $SED 's/^\([[0-9]]\)*\.[[0-9]]*\.[[0-9]]*.*$/\1/') minor_version=$(echo AC_PACKAGE_VERSION | $SED 's/^[[0-9]]*\.\([[0-9]]*\)\.[[0-9]]*.*$/\1/') patchlevel_version=$(echo AC_PACKAGE_VERSION | $SED 's/^[[0-9]]*\.[[0-9]]*\.\([[0-9]]*\).*$/\1/') @@ -27,9 +73,6 @@ version_description_c=$(echo $version_description | $SED 's/"/\\"/g') AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], "") AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description_c"], "") -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], @@ -39,7 +82,7 @@ AC_ARG_ENABLE(libtool-linkdep-fixup, AS_IF([test "x$libtool_fixup" = "xyes"], [ - libtool_m4="$srcdir/config/libtool.m4" + libtool_m4="$srcdir/m4/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) @@ -66,11 +109,11 @@ AC_CHECK_HEADERS([ \ # Basic functions check AC_CHECK_FUNCS([ \ - atexit bzero clock_gettime dup2 fdatasync ftruncate \ + atexit bzero clock_gettime dup2 fdatasync fls ftruncate \ gethostbyname gethostname getpagesize localtime_r memchr memset \ mkdir munmap putenv realpath rmdir socket strchr strcspn strdup \ - strncasecmp strndup strpbrk strrchr strstr strtol strtoul \ - strtoull \ + strncasecmp strndup strnlen strpbrk strrchr strstr strtol strtoul \ + strtoull dirfd gethostbyname2 getipnodebyname \ ]) # Babeltrace viewer check @@ -507,37 +550,161 @@ AS_IF([test "x$enable_test_python3_agent" = "xyes" -o "x$test_python3_agent_auto ]) ]) - AC_SUBST([RUN_PYTHON_AGENT_TEST]) AC_SUBST([PYTHON2_AGENT]) AC_SUBST([PYTHON3_AGENT]) -AC_SYS_LARGEFILE +# Arguments for binaries build exclusion +AC_ARG_ENABLE([bin-lttng], AS_HELP_STRING([--disable-bin-lttng],[Disable the build of lttng binaries])) +AC_ARG_ENABLE([bin-lttng-consumerd], AS_HELP_STRING([--disable-bin-lttng-consumerd], + [Disable the build of lttng-consumerd binaries])) +AC_ARG_ENABLE([bin-lttng-crash], AS_HELP_STRING([--disable-bin-lttng-crash],[Disable the build of lttng-crash binaries])) +AC_ARG_ENABLE([bin-lttng-relayd], AS_HELP_STRING([--disable-bin-lttng-relayd], + [Disable the build of lttng-relayd binaries])) +AC_ARG_ENABLE([bin-lttng-sessiond], AS_HELP_STRING([--disable-bin-lttng-sessiond], + [Disable the build of lttng-sessiond binaries])) +AC_ARG_ENABLE([extras], AS_HELP_STRING([--disable-extras], + [Disable the build of the extra components])) + + +# Always build libconfig since it a dependency of libcommon +build_lib_config=yes + +build_lib_compat=no +build_lib_consumer=no +build_lib_hashtable=no +build_lib_health=no +build_lib_index=no +build_lib_kernel_consumer=no +build_lib_kernel_ctl=no +build_lib_lttng_ctl=no +build_lib_relayd=no +build_lib_sessiond_comm=no +build_lib_testpoint=no +build_lib_ust_consumer=no + +# There is an overlap for enabled dependencies, but this makes everything +# simpler. libcommon and libconfig are always compiled so they are not repeated +# here. + +# Enable binary dependencies. +AS_IF([test x$enable_bin_lttng != xno], + [ + build_lib_lttng_ctl=yes + ] +) -# C compiler tests -AC_PROG_CC -AC_C_INLINE +AS_IF([test x$enable_bin_lttng_consumerd != xno], + [ + build_lib_consumer=yes + build_lib_sessiond_comm=yes + build_lib_index=yes + build_lib_health=yes + build_lib_testpoint=yes + ] +) -# Type availability checking -AC_TYPE_INT32_T -AC_TYPE_INT64_T -AC_TYPE_MODE_T -AC_TYPE_OFF_T -AC_TYPE_PID_T -AC_TYPE_SIZE_T -AC_TYPE_SSIZE_T -AC_TYPE_UID_T -AC_TYPE_UINT16_T -AC_TYPE_UINT32_T -AC_TYPE_UINT64_T -AC_TYPE_UINT8_T +AS_IF([test x$enable_bin_lttng_crash != xno], + # Do nothing since libconfig and libcommon are built by default. + [] +) -LT_INIT -AC_PROG_YACC -AC_PROG_LEX +AS_IF([test x$enable_bin_lttng_relayd != xno], + [ + build_lib_lttng_ctl=yes + build_lib_sessiond_comm=yes + build_lib_hashtable=yes + build_lib_compat=yes + build_lib_index=yes + build_lib_health=yes + build_lib_testpoint=yes + ] +) +AS_IF([test x$enable_bin_lttng_sessiond != xno], + [ + build_lib_lttng_ctl=yes + build_lib_sessiond_comm=yes + build_lib_kernel_ctl=yes + build_lib_hashtable=yes + build_lib_compat=yes + build_lib_relayd=yes + build_lib_testpoint=yes + build_lib_health=yes + build_lib_health=yes + ] +) + +# Libraries dependencies enabling +AS_IF([test x$build_lib_lttng_ctl = xyes], + [ + build_lib_sessiond_comm=yes + build_lib_hashtable=yes + ] +) + +AS_IF([test x$build_lib_consumer = xyes], + [ + build_lib_sessiond_comm=yes + build_lib_kernel_consumer=yes + build_lib_hashtable=yes + build_lib_compat=yes + build_lib_relayd=yes + AS_IF([test x$lttng_ust_ctl_found = xyes],[build_lib_ust_consumer=yes]) + ] +) + +AS_IF([test x$build_lib_kernel_consumer = xyes], + [ + build_lib_kernel_ctl=yes + build_lib_relayd=yes + ] +) + +AS_IF([test x$build_lib_relayd = xyes], + [ + build_lib_sessiond_comm=yes + ] +) + + +# Export binaries build conditions. +AM_CONDITIONAL([BUILD_BIN_LTTNG], [test x$enable_bin_lttng != xno]) +AM_CONDITIONAL([BUILD_BIN_LTTNG_CONSUMERD], [test x$enable_bin_lttng_consumerd != xno]) +AM_CONDITIONAL([BUILD_BIN_LTTNG_CRASH], [test x$enable_bin_lttng_crash != xno]) +AM_CONDITIONAL([BUILD_BIN_LTTNG_RELAYD], [test x$enable_bin_lttng_relayd != xno]) +AM_CONDITIONAL([BUILD_BIN_LTTNG_SESSIOND], [test x$enable_bin_lttng_sessiond != xno]) + +# Export the tests and extras build conditions. +AS_IF([\ +test "x$enable_bin_lttng" != "xno" && \ +test "x$enable_bin_lttng_consumerd" != "xno" && \ +test "x$enable_bin_lttng_crash" != "xno" && \ +test "x$enable_bin_lttng_relayd" != "xno" && \ +test "x$enable_bin_lttng_sessiond" != "xno"], +[build_tests=yes], +[build_tests=no] +) + +AM_CONDITIONAL([BUILD_TESTS], [test x$build_tests = xyes]) +AM_CONDITIONAL([BUILD_EXTRAS], [test x$enable_extras != xno]) + +# Export libraries build conditions. +AM_CONDITIONAL([BUILD_LIB_COMPAT], [test x$build_lib_compat = xyes]) +AM_CONDITIONAL([BUILD_LIB_CONFIG], [test x$build_lib_config = xyes]) +AM_CONDITIONAL([BUILD_LIB_CONSUMER], [test x$build_lib_consumer = xyes]) +AM_CONDITIONAL([BUILD_LIB_HASHTABLE], [test x$build_lib_hashtable = xyes]) +AM_CONDITIONAL([BUILD_LIB_HEALTH], [test x$build_lib_health = xyes]) +AM_CONDITIONAL([BUILD_LIB_INDEX], [test x$build_lib_index = xyes]) +AM_CONDITIONAL([BUILD_LIB_KERNEL_CONSUMER], [test x$build_lib_kernel_consumer = xyes]) +AM_CONDITIONAL([BUILD_LIB_KERNEL_CTL], [test x$build_lib_kernel_ctl = xyes]) +AM_CONDITIONAL([BUILD_LIB_LTTNG_CTL], [test x$build_lib_lttng_ctl = xyes]) +AM_CONDITIONAL([BUILD_LIB_RELAYD], [test x$build_lib_relayd = xyes]) +AM_CONDITIONAL([BUILD_LIB_SESSIOND_COMM], [test x$build_lib_sessiond_comm = xyes]) +AM_CONDITIONAL([BUILD_LIB_TESTPOINT], [test x$build_lib_testpoint = xyes]) +AM_CONDITIONAL([BUILD_LIB_UST_CONSUMER], [test x$build_lib_ust_consumer = xyes]) if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-parser.h"; then - if test x"$YACC" != "xbison -y"; then + if test x"$(basename "$YACC")" != "xbison -y"; then AC_MSG_ERROR([[bison not found and is required when building from git. Please install bison]]) fi @@ -584,6 +751,7 @@ AC_CONFIG_FILES([ src/common/Makefile src/common/kernel-ctl/Makefile src/common/kernel-consumer/Makefile + src/common/consumer/Makefile src/common/ust-consumer/Makefile src/common/hashtable/Makefile src/common/sessiond-comm/Makefile @@ -649,13 +817,13 @@ AC_CONFIG_FILES([ tests/utils/testapp/gen-ust-tracef/Makefile ]) -# Inject variable into python test script +# Inject variable into python test script. AC_CONFIG_FILES([tests/regression/ust/python-logging/test_python_logging],[chmod +x tests/regression/ust/python-logging/test_python_logging]) AC_OUTPUT # -# Mini-report on what will be built +# Mini-report on what will be built. # AS_ECHO() @@ -664,7 +832,7 @@ AS_ECHO("$version_description") AS_ECHO() -# Target architecture we're building for +# Target architecture we're building for. target_arch=$host_cpu [ for f in $CFLAGS; do @@ -694,6 +862,69 @@ AS_IF([test "x$lttng_ust_support" = "xyes"],[ AS_ECHO("Disabled") ]) +AS_ECHO() +AS_ECHO("Binaries:") + +# List binaries to be built +AS_ECHO_N("lttng: ") +AS_IF([test x$enable_bin_lttng != xno],[ + AS_ECHO("Enabled") +],[ + AS_ECHO("Disabled") +]) + +AS_ECHO_N("lttng-consumerd: ") +AS_IF([test x$enable_bin_lttng_consumerd != xno],[ + AS_ECHO("Enabled") +],[ + AS_ECHO("Disabled") +]) + +AS_ECHO_N("lttng-crash: ") +AS_IF([test x$enable_bin_lttng_crash != xno],[ + AS_ECHO("Enabled") +],[ + AS_ECHO("Disabled") +]) + +AS_ECHO_N("lttng-relayd: ") +AS_IF([test x$enable_bin_lttng_relayd != xno],[ + AS_ECHO("Enabled") +],[ + AS_ECHO("Disabled") +]) + +AS_ECHO_N("lttng-sessiond: ") +AS_IF([test x$enable_bin_lttng_sessiond != xno],[ + AS_ECHO("Enabled") +],[ + AS_ECHO("Disabled") +]) + +AS_ECHO_N("Extras: ") +AS_IF([test x$enable_extras != xno],[ + AS_ECHO("Enabled") +],[ + AS_ECHO("Disabled") +]) + +# 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`") + + +AS_ECHO() + +# Print clear message that tests won't be built +AS_IF([test "x$build_tests" = "xno"],[ + AS_ECHO("WARNING: Tests won't be built since some binaries were disabled") +]) + +AS_ECHO("Tests:") + # LTTng UST Java agent JUL tests enabled/disabled AS_ECHO_N("LTTng-UST Java agent JUL tests: ") AS_IF([test "x$test_java_agent_jul" = "xyes"],[ @@ -732,62 +963,46 @@ AS_IF([test "x${enable_python_binding:-yes}" = xyes], [ 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.") +# If we build the sessiond, print the paths it will use +AS_ECHO() +AS_ECHO_N("The lttng command will search for the lttng-sessiond executable at: ") +AS_IF([test "$SESSIOND_BIN" = ""],[ + AS_ECHO_N("`eval eval echo $bindir`") + AS_ECHO("/lttng-sessiond") ],[ - AS_ECHO("All binaries will be built.") + AS_ECHO("$SESSIOND_BIN") ]) -# 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_N("The lttng command will look for the lttng-sessiond executable at: ") - AS_IF([test "$SESSIOND_BIN" = ""],[ - AS_ECHO_N("`eval eval echo $bindir`") - AS_ECHO("/lttng-sessiond") - ],[ - AS_ECHO("$SESSIOND_BIN") - ]) - - 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("The sessiond daemon will search the following directories: ") +AS_ECHO_N("32-bit consumerd executable: ") +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("32-bit consumer libraries: ") +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 consumerd executable: ") +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_N("64-bit consumer libraries: ") +AS_IF([test "$CONSUMERD64_LIBDIR" = ""],[ + AS_ECHO("`eval eval echo $libdir`") +],[ + AS_ECHO("$CONSUMERD64_LIBDIR") ]) AS_ECHO()