X-Git-Url: http://git.liburcu.org/?a=blobdiff_plain;f=configure.ac;h=6becf39f2314ac55c78957772c8cc26b80c45382;hb=dd08adc159626c1dbcb4bbff48f4f7bda5b12514;hp=450b43b23ce6af31047fde462918878dc91423c7;hpb=6f97f9c2bbc74605e3de2b05333ecf25fa52d6fc;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 450b43b2..6becf39f 100644 --- a/configure.ac +++ b/configure.ac @@ -1,269 +1,320 @@ -dnl -*- Autoconf -*- +dnl SPDX-License-Identifier: LGPL-2.1-only +dnl +dnl Copyright (C) 2021 EfficiOS, Inc. +dnl dnl Process this file with autoconf to produce a configure script. -dnl Version infos -m4_define([V_MAJOR], [2]) -m4_define([V_MINOR], [9]) -m4_define([V_PATCH], [0]) -m4_define([V_EXTRA], [rc1]) -m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH]) -m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])]) -m4_define([V_NAME], [[Joannès]]) -m4_define([V_DESC], [[Berliner Weisse style beer from the Trèfle Noir microbrewery in Rouyn-Noranda.]]) -AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com]) +# Project version information +m4_define([ust_version_major], [2]) +m4_define([ust_version_minor], [13]) +m4_define([ust_version_patch], [0]) +m4_define([ust_version_dev_stage], [-pre]) +m4_define([ust_version], ust_version_major[.]ust_version_minor[.]ust_version_patch[]ust_version_dev_stage) +m4_define([ust_version_name], [[Codename TBD]]) +m4_define([ust_version_description], [[Description TBD]]) +# Library version information of "liblttng-ust" # Following the numbering scheme proposed by libtool for the library version # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html -# This is the library version of liblttng-ust. -AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0]) -# note: remember to update tracepoint.h dlopen() to match this version -# number. TODO: eventually automate by exporting the major number. +m4_define([ust_lib_version_current], [1]) +m4_define([ust_lib_version_revision], [0]) +m4_define([ust_lib_version_age], [0]) +m4_define([ust_lib_version], ust_lib_version_current[:]ust_lib_version_revision[:]ust_lib_version_age) -# This is the library version of liblttng-ust-ctl, used internally by -# liblttng-ust, lttng-sessiond, and lttng-consumerd. -AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [2:0:0]) +# Library version information of "liblttng-ust-ctl" +# Following the numbering scheme proposed by libtool for the library version +# http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html +m4_define([ust_ctl_lib_version_current], [5]) +m4_define([ust_ctl_lib_version_revision], [0]) +m4_define([ust_ctl_lib_version_age], [0]) +m4_define([ust_ctl_lib_version], ust_ctl_lib_version_current[:]ust_ctl_lib_version_revision[:]ust_ctl_lib_version_age) + + +## ## +## Autoconf base setup ## +## ## +AC_PREREQ([2.69]) +AC_INIT([lttng-ust],[ust_version],[mathieu dot desnoyers at efficios dot com],[],[https://lttng.org]) + +AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h include/lttng/ust-version.h]) AC_CONFIG_AUX_DIR([config]) -AC_CANONICAL_TARGET -AC_CANONICAL_HOST -AC_CONFIG_MACRO_DIR([config]) -AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip tar-ustar]) -AM_MAINTAINER_MODE([enable]) -m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) +AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR([include/lttng/tracepoint.h]) -AC_REQUIRE_AUX_FILE([tap-driver.sh]) +AC_CANONICAL_TARGET +AC_CANONICAL_HOST -# Configuration options, which will be installed in the config.h -AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h]) -AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.]) -AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h]) -AH_TEMPLATE([LTTNG_UST_HAVE_PERF_EVENT], [Perf event integration via perf_event.h]) -dnl Substitute minor/major/patchlevel version numbers -AC_SUBST([MAJOR_VERSION], [V_MAJOR]) -AC_SUBST([MINOR_VERSION], [V_MINOR]) -AC_SUBST([PATCHLEVEL_VERSION], [V_PATCH]) +## ## +## Automake base setup ## +## ## -AC_PROG_SED -AC_PROG_GREP -AC_PROG_LN_S -AC_PROG_MKDIR_P +AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc -Wall -Wno-portability -Werror]) +AM_MAINTAINER_MODE([enable]) -# 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 -]) +# Enable silent rules by default +AM_SILENT_RULES([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]) - ]) -]) +## ## +## OS and Arch specific defaults ## +## ## -AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"]) +# Set os specific options +AS_CASE([$host_os], + [freebsd*], [NO_NUMA=1] +) -# Checks for programs. +# Set architecture specific options +AS_CASE([$host_cpu], + [i[[3456]]86], [], + [x86_64], [], + [amd64], [], + [powerpc], [], + [ppc64], [], + [ppc64le], [], + [powerpc64], [], + [powerpc64le], [], + [s390], [], + [s390x], [], + [arm*], [ + NO_NUMA=1 + ], + [aarch64*], [], + [mips*], [], + [tile*], [], + [ + unsupported_arch="yes" + ]) + + +## ## +## C compiler checks ## +## ## + +# Choose the C compiler AC_PROG_CC -AC_PROG_CXX -AC_CHECK_PROG([HAVE_CMAKE], [cmake], ["yes"]) -AM_CONDITIONAL([HAVE_CMAKE], [test "x$HAVE_CMAKE" = "xyes"]) -AC_PROG_MAKE_SET -LT_INIT +# AC_PROG_CC_STDC was merged in AC_PROG_CC in autoconf 2.70 +m4_version_prereq([2.70], [], [AC_PROG_CC_STDC]) -# rw_PROG_CXX_WORKS -# Check whether the C++ compiler works. -AC_CACHE_CHECK([whether the C++ compiler works], [rw_cv_prog_cxx_works], [ - AC_LANG_PUSH([C++]) +# Make sure the C compiler supports C99 +AS_IF([test "$ac_cv_prog_cc_c99" = "no"], [AC_MSG_ERROR([The compiler does not support C99])]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [ - check_cxx_designated_initializers=yes - ], [ - rw_cv_prog_cxx_works=no - ]) +# Enable available system extensions and LFS support +AC_USE_SYSTEM_EXTENSIONS +AC_SYS_LARGEFILE - AS_IF([test "x$check_cxx_designated_initializers" = "xyes"], [ - AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - struct foo { int a; int b; }; - void fct(void) - { - struct foo f = { .a = 0, .b = 1 }; - } - ]])], [ - rw_cv_prog_cxx_works=yes - ], [ - rw_cv_prog_cxx_works=no - ]) - ]) +# Make sure the C compiler supports __attribute__ +AX_C___ATTRIBUTE__ +AS_IF([test "x$ax_cv___attribute__" != "xyes"], + [AC_MSG_ERROR([The compiler does not support __attribute__ extensions])]) + +# Make sure we have pthread support +AX_PTHREAD([], [AC_MSG_ERROR([Could not configure pthread support])]) - AC_LANG_POP([C++]) +# Make sure the C compiler supports weak symbols +AX_SYS_WEAK_ALIAS +AS_IF([test "x$ax_cv_sys_weak_alias" = "xno"], + [AC_MSG_ERROR([Your platform doesn't support weak symbols.])]) + +# Checks for typedefs, structures, and compiler characteristics. +AC_C_INLINE +AC_C_TYPEOF +AC_TYPE_INT16_T +AC_TYPE_INT32_T +AC_TYPE_INT64_T +AC_TYPE_INT8_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 +AC_CHECK_TYPES([ptrdiff_t]) + + +## ## +## C++ compiler checks ## +## ## + +# Find an optional C++11 compiler without GNU extensions (-std=c++11) +AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) +AM_CONDITIONAL([HAVE_CXX], [test "$HAVE_CXX11" = "1"]) + + +## ## +## Header checks ## +## ## + +AC_HEADER_STDBOOL +AC_CHECK_HEADERS([ \ + arpa/inet.h \ + dlfcn.h \ + fcntl.h \ + float.h \ + limits.h \ + linux/perf_event.h \ + locale.h \ + stddef.h \ + sys/socket.h \ + sys/time.h \ + wchar.h \ ]) -AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) +# Check for dlinfo() by testing for RTLD_DI_LINKMAP in dlfcn.h +AS_IF([test "x$ac_cv_header_dlfcn_h" = "xyes"], [ + AC_CHECK_DECL([RTLD_DI_LINKMAP], [], [], [[#include ]]) +]) -# Check if the compiler support weak symbols -AX_SYS_WEAK_ALIAS -AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [ - AC_MSG_ERROR([Your platform doesn't support weak symbols.]) +## ## +## Programs checks ## +## ## + +AM_PROG_AR +AC_PROG_SED +AC_PROG_GREP +AC_PROG_LN_S +AC_PROG_MKDIR_P +AC_PROG_MAKE_SET +AC_CHECK_PROGS([ASCIIDOC], [asciidoc]) +AC_CHECK_PROGS([CMAKE], [cmake]) +AC_CHECK_PROGS([FOLD], [fold]) +AC_CHECK_PROGS([XMLTO], [xmlto]) + +AM_PATH_PYTHON([2.7], [], [PYTHON=""]) + +AX_PROG_JAVAC +AX_PROG_JAVA +AX_PROG_JAR + +# Initialize and configure libtool +LT_INIT([disable-static]) + + +## ## +## Library checks ## +## ## + +AC_FUNC_CHOWN +AC_FUNC_FORK +AC_FUNC_MMAP +AC_FUNC_STRERROR_R +AC_FUNC_STRNLEN +AC_CHECK_FUNCS([ \ + atexit \ + clock_gettime \ + ftruncate \ + getpagesize \ + gettimeofday \ + localeconv \ + memchr \ + memmove \ + memset \ + mkdir \ + munmap \ + realpath \ + sched_getcpu \ + socket \ + strchr \ + strdup \ + strerror \ + strtol \ + strtoul \ + sysconf \ ]) -# Checks for libraries. +# AC_FUNC_MALLOC causes problems when cross-compiling. +#AC_FUNC_MALLOC +#AC_FUNC_REALLOC + +# Check for pthread_setname_np and its signature +LTTNG_PTHREAD_SETNAME_NP +LTTNG_PTHREAD_GETNAME_NP + +# Check dor dlopen() in -ldl or -lc AC_CHECK_LIB([dl], [dlopen], [ - have_libdl=yes + libdl_name=dl + DL_LIBS="-ldl" ], [ - #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.]) - ]) + # dlopen not found in libdl, check in libc + AC_CHECK_LIB([c], [dlopen], [ + libdl_name=c + DL_LIBS="-lc" + ], [ + AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.]) + ]) ]) +AC_SUBST(DL_LIBS) -AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBDL], [test "x$have_libdl" = "xyes"]) -AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"]) - -AC_CHECK_LIB([pthread], [pthread_create]) -AC_CHECK_LIB([pthread], [pthread_setname_np], - AC_DEFINE([HAVE_PTHREAD_SETNAME_NP], [1], [Define to 1 if pthread_setname_np is available.]), - AC_CHECK_LIB([pthread], [pthread_set_name_np], - AC_DEFINE([HAVE_PTHREAD_SET_NAME_NP], [1], [Define to 1 if pthread_set_name_np is available.]), - AC_MSG_RESULT([pthread setname/set_name not found.]))) - -# Check for dlfcn.h -AC_CHECK_HEADER([dlfcn.h]) -AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], [ - AC_CHECK_DECLS([RTLD_DI_LINKMAP], [], [], [ - #define _GNU_SOURCE /* Required on Linux to get GNU extensions */ - #include - ]) -], [ - ac_cv_have_decl_RTLD_DI_LINKMAP="no" +# Check if libdl has dlmopen() +AC_CHECK_LIB([$libdl_name], [dlmopen], [ + AC_DEFINE([HAVE_DLMOPEN], [1], [Define to 1 if dlmopen is available.]) ]) -AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"]) +# Require URCU >= 0.12 for DEFINE_URCU_TLS_INIT +PKG_CHECK_MODULES([URCU], [liburcu >= 0.12]) -# Checks for header files. -dnl AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) -# Checks for typedefs, structures, and compiler characteristics. -AC_C_INLINE -dnl AC_TYPE_INT16_T -dnl AC_TYPE_INT32_T -dnl AC_TYPE_INT64_T -dnl AC_TYPE_INT8_T -dnl AC_TYPE_PID_T -dnl AC_TYPE_SIZE_T -dnl AC_TYPE_SSIZE_T -dnl AC_TYPE_UINT16_T -dnl AC_TYPE_UINT32_T -dnl AC_TYPE_UINT64_T -dnl AC_TYPE_UINT8_T -dnl AC_CHECK_TYPES([ptrdiff_t]) - -# Checks for library functions. -AC_FUNC_MALLOC -AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf]) - -CFLAGS="-Wall $CFLAGS" - -# URCU - -# urcu - check if we just find the headers it out of the box. -AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CPPFLAGS]=-Idir to specify their location. -This error can also occur when the liburcu package's configure script has not been run.])]) - -# urcu-cds - check that URCU Concurrent Data Structure lib is available to compilation -# Part of Userspace RCU library 0.7.2 or better. -AC_CHECK_LIB([urcu-cds], [_cds_lfht_new], [], [AC_MSG_ERROR([Cannot find -liburcu-cds lib, part of Userspace RCU 0.7 or better. Use [LDFLAGS]=-Ldir to specify its location.])]) - -AC_MSG_CHECKING([caa_likely()]) -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #include - void fct(void) - { - if (caa_likely(1)) { - } - } -]])], [ +AM_CONDITIONAL([HAVE_CMAKE], [test "x$CMAKE" != "x"]) + +AC_MSG_CHECKING([whether shared libraries are enabled]) +AS_IF([test "x$enable_shared" = "xyes"], [ AC_MSG_RESULT([yes]) ], [ AC_MSG_RESULT([no]) - AC_MSG_ERROR([Please upgrade your version of liburcu to 0.6.6 or better]) + AC_MSG_ERROR([LTTng-UST requires shared libraries to be enabled]) ]) -# urcu - check that URCU lib is available to compilation -AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])]) - -# urcu - check that URCU lib is at least version 0.6 -AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])]) +# Configuration options, which will be installed in the config.h +AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h]) -# optional linux/perf_event.h -AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes], []) -# Perf event counters are supported on all architectures supported by -# perf, using the read system call as fallback. -AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$have_perf_event" = "xyes"]) +AM_CONDITIONAL([ENABLE_UST_DL], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"]) -AS_IF([test "x$have_perf_event" = "xyes"], [ - AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1]) +# numa.h integration +AS_IF([test "x$NO_NUMA" = "x1"],[ + AS_IF([test "x$enable_numa" = "x" ], [enable_numa=no]) ]) -AC_MSG_CHECKING([host system alignment requirements]) -AS_CASE([$host_cpu], - [i[[3456]]86], [], - [x86_64], [], - [amd64], [], - [powerpc], [], - [ppc64], [], - [ppc64le], [], - [powerpc64], [], - [powerpc64le], [], - [s390], [NO_UNALIGNED_ACCESS=1], - [s390x], [NO_UNALIGNED_ACCESS=1], - [arm*], [NO_UNALIGNED_ACCESS=1], - [aarch64*], [NO_UNALIGNED_ACCESS=1], - [mips*], [NO_UNALIGNED_ACCESS=1], - [tile*], [NO_UNALIGNED_ACCESS=1], - [ - UNSUPPORTED_ARCH=1 - NO_UNALIGNED_ACCESS=1 - ]) -AC_MSG_RESULT([$host_cpu]) +AC_ARG_ENABLE([numa], [ +AS_HELP_STRING([--disable-numa], [disable NUMA support]) +], [ + enable_numa=$enableval +], [ + enable_numa=yes +]) -AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [ - AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) +AS_IF([test "x$enable_numa" = "xyes"], [ + # numa - check that numa lib is available + AC_CHECK_LIB([numa], [numa_available], [], +[AC_MSG_ERROR([libnuma is not available. Please either install it (e.g. libnuma-dev) or use [LDFLAGS]=-Ldir to specify the right location, or use --disable-numa configure argument to disable NUMA support.])]) + have_libnuma=yes ]) +AM_CONDITIONAL([ENABLE_NUMA], [test "x$have_libnuma" = "xyes"]) + +AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$ac_cv_header_linux_perf_event_h" = "xyes"]) # Check for JNI header files if requested AC_ARG_ENABLE([jni-interface], [ - AS_HELP_STRING([--enable-jni-interface], [build JNI interface between C and Java. Needs Java include files [default=no]]) +AS_HELP_STRING([--enable-jni-interface], [build JNI interface between C and Java. Needs Java include files [default=no]]) ], [ jni_interface=$enableval ], [ jni_interface=no ]) -AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"]) +AM_CONDITIONAL([ENABLE_JNI_INTERFACE], [test "x$jni_interface" = "xyes"]) AC_ARG_ENABLE([java-agent-jul], [ - AS_HELP_STRING([--enable-java-agent-jul], [build the LTTng UST Java agent with JUL support [default=no]]) +AS_HELP_STRING([--enable-java-agent-jul], [build the LTTng UST Java agent with JUL support [default=no]]) ], [ java_agent_jul=$enableval ], [ @@ -271,7 +322,7 @@ AC_ARG_ENABLE([java-agent-jul], [ ]) AC_ARG_ENABLE([java-agent-log4j], [ - AS_HELP_STRING([--enable-java-agent-log4j], [build the LTTng UST Java agent with Log4j support [default=no]]) +AS_HELP_STRING([--enable-java-agent-log4j], [build the LTTng UST Java agent with Log4j support [default=no]]) ], [ java_agent_log4j=$enableval ], [ @@ -279,31 +330,34 @@ AC_ARG_ENABLE([java-agent-log4j], [ ]) AC_ARG_ENABLE([java-agent-all], [ - AS_HELP_STRING([--enable-java-agent-all], [build the LTTng UST Java agent with all supported backends [default=no]]) +AS_HELP_STRING([--enable-java-agent-all], [build the LTTng UST Java agent with all supported backends [default=no]]) ], [ java_agent_jul=$enableval java_agent_log4j=$enableval ], [:]) -AM_CONDITIONAL([BUILD_JAVA_AGENT], [test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"]) -AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_JUL], [test "x$java_agent_jul" = "xyes"]) -AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_LOG4J], [test "x$java_agent_log4j" = "xyes"]) +AM_CONDITIONAL([ENABLE_JAVA_AGENT], [test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"]) +AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_JUL], [test "x$java_agent_jul" = "xyes"]) +AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_LOG4J], [test "x$java_agent_log4j" = "xyes"]) AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"], [ AX_JAVA_OPTIONS - AX_PROG_JAVAC - AX_PROG_JAVA - AX_PROG_JAR + AC_ARG_VAR([CLASSPATH], [Java class path]) AX_JNI_INCLUDE_DIR for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS do - CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR" + JNI_CPPFLAGS="$JNI_CPPFLAGS -I$JNI_INCLUDE_DIR" done + saved_CPPFLAGS="$CPPFLAGS" + CPPFLAGS="$CPPFLAGS $JNI_CPPFLAGS" AX_PROG_JAVAH + CPPFLAGS="$saved_CPPFLAGS" ]) +AM_CONDITIONAL([HAVE_JAVAH], [test "x$JAVAH" != "x"]) + AS_IF([test "x$java_agent_log4j" = "xyes"], [ AX_CHECK_CLASSPATH AX_CHECK_CLASS([org.apache.log4j.Logger]) @@ -314,18 +368,15 @@ AS_IF([test "x$java_agent_log4j" = "xyes"], [ # Option to build the python agent AC_ARG_ENABLE([python-agent], [ - AS_HELP_STRING([--enable-python-agent], [build the LTTng UST Python agent [default=no]]) +AS_HELP_STRING([--enable-python-agent], [build the LTTng UST Python agent [default=no]]) ], [ python_agent=$enableval ], [:]) -AM_CONDITIONAL([BUILD_PYTHON_AGENT], [test "x$python_agent" = "xyes"]) -AS_IF([test "x$python_agent" = "xyes"], [ - AM_PATH_PYTHON([2.7]) -]) +AM_CONDITIONAL([ENABLE_PYTHON_AGENT], [test "x$python_agent" = "xyes"]) # sdt.h integration AC_ARG_WITH([sdt], [ - AS_HELP_STRING([--with-sdt], [provide SystemTap integration via sdt.h [default=no]]) +AS_HELP_STRING([--with-sdt], [provide SystemTap integration via sdt.h [default=no]]) ], [ with_sdt=$withval ], [ @@ -350,16 +401,8 @@ AS_IF([test "x$with_sdt" = "xyes"], [ ]) ]) -AC_MSG_CHECKING([whether shared libraries are enabled]) -AS_IF([test "x$enable_shared" = "xyes"], [ - AC_MSG_RESULT([yes]) -], [ - AC_MSG_RESULT([no]) - AC_MSG_ERROR([LTTng-UST requires shared libraries to be enabled]) -]) - AC_ARG_WITH([lttng-system-rundir], [ - AS_HELP_STRING([--with-lttng-system-rundir], [Location of the system directory where LTTng-UST expects the system-wide lttng-sessiond runtime files. The default is "/var/run/lttng".]), +AS_HELP_STRING([--with-lttng-system-rundir], [Location of the system directory where LTTng-UST expects the system-wide lttng-sessiond runtime files. The default is "/var/run/lttng".]), ], [ lttng_system_rundir="$withval" ], [ @@ -368,13 +411,20 @@ AC_ARG_WITH([lttng-system-rundir], [ AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], [LTTng system runtime directory]) -AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES], [python], ["yes"]) -AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test "x$BUILD_GEN_TP_EXAMPLES" = "xyes"]) +AM_CONDITIONAL([ENABLE_GEN_TP_EXAMPLES], [test "x$PYTHON" != "x"]) + +# Enable building examples +AC_ARG_ENABLE( + examples, + AS_HELP_STRING( + [--disable-examples], + [Do not build and install examples] + ), + [enable_examples=$enableval], + [enable_examples=yes] +) -# Set $IN_GIT_REPO if we're in the Git repository; the `bootstrap` file -# is not distributed in tarballs. -AS_IF([test -f "$srcdir/bootstrap"], [in_git_repo=yes], [in_git_repo=no]) -AM_CONDITIONAL([IN_GIT_REPO], [test "x$in_git_repo" = "xyes"]) +AM_CONDITIONAL([ENABLE_EXAMPLES], [test "x$enable_examples" != "xno"]) # Enable building man pages (user's intention). AC_ARG_ENABLE( @@ -389,13 +439,11 @@ AC_ARG_ENABLE( # Check for asciidoc and xmlto if we enabled building the man pages. have_asciidoc_xmlto=no +warn_prebuilt_man_pages=no AS_IF([test "x$man_pages_opt" = "xyes"], [ - AC_PATH_PROG([ASCIIDOC], [asciidoc], [no]) - AC_PATH_PROG([XMLTO], [xmlto], [no]) - - AS_IF([test "x$ASCIIDOC" = "xno" || test "x$XMLTO" = "xno"], [ - AS_IF([test "x$in_git_repo" = "xyes"], [ + AS_IF([test "x$ASCIIDOC" = "x" || test "x$XMLTO" = "x"], [ + AE_IF_IN_GIT_REPO([ # This is an error because we're in the Git repo, which # means the man pages are not already generated for us, # thus asciidoc/xmlto are required because we were asked @@ -409,13 +457,7 @@ they will not be installed. # Only warn here: since we're in the tarball, the man # pages should already be generated at this point, thus # asciidoc/xmlto are not strictly required. - AC_MSG_WARN([ -Both asciidoc and xmlto are needed to build the LTTng-UST man pages. -Note that the man pages are already built in this distribution tarball, -so asciidoc and xmlto are only needed if you intend to modify their -sources. Use --disable-man-pages to completely disable building -and installing the man pages. - ]) + warn_prebuilt_man_pages=yes ]) ], [ have_asciidoc_xmlto=yes @@ -424,28 +466,48 @@ and installing the man pages. # Export man page build condition: build the man pages if the user # asked for it, and if the tools are available. -AM_CONDITIONAL([MAN_PAGES_OPT], [test "x$man_pages_opt" != "xno"]) +AM_CONDITIONAL([ENABLE_MAN_PAGES], [test "x$man_pages_opt" != "xno"]) AM_CONDITIONAL([HAVE_ASCIIDOC_XMLTO], [test "x$have_asciidoc_xmlto" = "xyes"]) -# Default values -AC_DEFUN([_AC_DEFINE_AND_SUBST], [ - AC_DEFINE_UNQUOTED([CONFIG_$1], [$2], [$1]) - $1="$2" - AC_SUBST([$1]) -]) -_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000]) -# By default, do not retry on buffer full condition. -_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_BLOCKING_RETRY_TIMEOUT_MS], [0]) +# Defined in include/lttng/ust-version.h +AC_DEFINE([LTTNG_UST_MAJOR_VERSION], ust_version_major, [LTTng UST major version]) +AC_DEFINE([LTTNG_UST_MINOR_VERSION], ust_version_minor, [LTTng UST minor version]) +AC_DEFINE([LTTNG_UST_PATCHLEVEL_VERSION], ust_version_patch, [LTTng UST patch version]) +AC_DEFINE([LTTNG_UST_VERSION], ["]ust_version["], [LTTng UST version string]) +AC_DEFINE([LTTNG_UST_LIB_SONAME_MAJOR], [ust_lib_version_current], [Major SONAME number of liblttng-ust]) +AC_DEFINE([LTTNG_UST_CTL_LIB_SONAME_MAJOR], [ust_ctl_lib_version_current], [Major SONAME number of liblttng-ust-ctl]) + + +AM_CFLAGS="-Wall $URCU_CFLAGS $PTHREAD_CFLAGS" +AC_SUBST(AM_CFLAGS) + +AM_CXXFLAGS="$AM_CFLAGS" +AC_SUBST(AM_CXXFLAGS) +# The order in which the include folders are searched is important. +# The top_builddir should always be searched first in the event that a build +# time generated file is included. +AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h" +AC_SUBST(AM_CPPFLAGS) + +AC_SUBST(JNI_CPPFLAGS) + + +## ## +## Output files generated by configure ## +## ## + +# List of files to be generated from '.in' templates by AC_OUTPUT AC_CONFIG_FILES([ Makefile doc/Makefile doc/examples/Makefile doc/man/Makefile include/Makefile - include/lttng/ust-version.h snprintf/Makefile + libcounter/Makefile + libmsgpack/Makefile libringbuffer/Makefile liblttng-ust-comm/Makefile liblttng-ust/Makefile @@ -472,60 +534,141 @@ AC_CONFIG_FILES([ python-lttngust/lttngust/__init__.py tools/Makefile tests/Makefile - tests/ctf-types/Makefile - tests/hello/Makefile - tests/hello.cxx/Makefile - tests/same_line_tracepoint/Makefile - tests/snprintf/Makefile - tests/ust-elf/Makefile + tests/compile/Makefile + tests/compile/ctf-types/Makefile + tests/compile/hello.cxx/Makefile + tests/compile/hello/Makefile + tests/compile/hello-many/Makefile + tests/compile/same_line_tracepoint/Makefile + tests/compile/test-app-ctx/Makefile tests/benchmark/Makefile + tests/unit/gcc-weak-hidden/Makefile + tests/unit/libmsgpack/Makefile + tests/unit/Makefile + tests/unit/libringbuffer/Makefile + tests/unit/pthread_name/Makefile + tests/unit/snprintf/Makefile + tests/unit/ust-elf/Makefile tests/utils/Makefile - tests/test-app-ctx/Makefile - tests/gcc-weak-hidden/Makefile lttng-ust.pc -]) - -# Create link for python agent for the VPATH guru. -AC_CONFIG_LINKS([ - python-lttngust/lttngust/agent.py:python-lttngust/lttngust/agent.py - python-lttngust/lttngust/cmd.py:python-lttngust/lttngust/cmd.py - python-lttngust/lttngust/debug.py:python-lttngust/lttngust/debug.py - python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py + lttng-ust-ctl.pc ]) AC_OUTPUT + +## ## +## Mini-report on what will be built. ## +## ## + +PPRINT_INIT +PPRINT_SET_INDENT(1) +PPRINT_SET_TS(38) + AS_ECHO -AS_ECHO(["m4_bpatsubst(V_NAME, ["], [\\"])"]) +AS_IF([test -n "ust_version_name"], [ + AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION \"ust_version_name\"$PPRINT_COLOR_RST") +], [ + AS_ECHO("${PPRINT_COLOR_BLDBLU}LTTng-ust $PACKAGE_VERSION") +]) + AS_ECHO -AS_ECHO(["m4_bpatsubst(V_DESC, ["], [\\"])"]) -# Report on the configuration options +AS_IF([test -n "ust_version_description"], [ + AS_IF([test -n "$FOLD"], [ + AS_ECHO("`AS_ECHO("ust_version_description") | $FOLD -s`") + ], [ + AS_ECHO("ust_version_description") + ]) + AS_ECHO +]) + +PPRINT_SUBTITLE([System]) + +PPRINT_PROP_STRING([Target architecture], $host_cpu) + +AS_IF([test "x$unsupported_arch" = "xyes"],[ + PPRINT_WARN([Your architecture ($host_cpu) is unsupported, using safe default of no unaligned access.]) +]) + AS_ECHO -AS_ECHO(["LTTng-UST will be built with the following options:"]) +PPRINT_SUBTITLE([Features]) +PPRINT_SET_INDENT(1) + +test "x$with_sdt" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL_CUSTOM([sdt.h integration], $value, [use --with-sdt]) + +test "x$java_agent_jul" = xyes && value=1 || value=0 +PPRINT_PROP_BOOL_CUSTOM([Java agent (JUL support)], $value, [use --enable-java-agent-jul]) + +test "x$java_agent_log4j" = xyes && value=1 || value=0 +PPRINT_PROP_BOOL_CUSTOM([Java agent (Log4j support)], $value, [use --enable-java-agent-log4j]) + +test "x$jni_interface" = xyes && value=1 || value=0 +PPRINT_PROP_BOOL_CUSTOM([JNI interface (JNI)], $value, [use --enable-jni-interface]) + +test "x$python_agent" = xyes && value=1 || value=0 +PPRINT_PROP_BOOL_CUSTOM([Python agent], $value, [use --enable-python-agent]) + +test "x$ac_cv_header_linux_perf_event_h" = "xyes" && value=1 || value=0 +PPRINT_PROP_BOOL_CUSTOM([Perf event integration], $value) + +test "x$enable_numa" = xyes && value=1 || value=0 +PPRINT_PROP_BOOL([NUMA], $value) AS_ECHO +PPRINT_SET_INDENT(0) + +test "x$enable_examples" = xyes && value=1 || value=0 +PPRINT_PROP_BOOL([Build and install examples], $value, $PPRINT_COLOR_SUBTITLE) -AS_ECHO_N(["Java agent (JUL support): "]) -AS_IF([test "x$java_agent_jul" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled (Use --enable-java-agent-jul)"])]) +# man pages build enabled/disabled +m4_pushdef([build_man_pages_msg], [Build and install man pages]) -AS_ECHO_N(["Java agent (Log4j support): "]) -AS_IF([test "x$java_agent_log4j" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled (Use --enable-java-agent-log4j)"])]) +AS_IF([test "x$man_pages_opt" != "xno"], [ + AE_IF_IN_GIT_REPO([ + PPRINT_PROP_BOOL([build_man_pages_msg], 1, $PPRINT_COLOR_SUBTITLE) + ], [ + AS_IF([test "x$have_asciidoc_xmlto" = "xyes"], [ + PPRINT_PROP_BOOL([build_man_pages_msg], 1, $PPRINT_COLOR_SUBTITLE) + ], [ + PPRINT_PROP_STRING([build_man_pages_msg], + [${PPRINT_COLOR_BLDGRN}yes (already built)], + $PPRINT_COLOR_SUBTITLE) + ]) + ]) +], [ + PPRINT_PROP_BOOL([build_man_pages_msg], 0, $PPRINT_COLOR_SUBTITLE) +]) -AS_ECHO_N(["JNI interface (JNI): "]) -AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled (Use --enable-jni-interface)"])]) +m4_popdef([build_man_pages_msg]) -AS_ECHO_N(["Python ($PYTHON) agent: "]) -AS_IF([test "x$python_agent" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled (Use --enable-python-agent)"])]) +PPRINT_SET_INDENT(1) -AS_ECHO_N(["sdt.h integration: "]) -AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])]) +report_bindir="`eval eval echo $bindir`" +report_libdir="`eval eval echo $libdir`" -AS_ECHO(["Architecture: $host_cpu"]) -AS_ECHO_N(["Efficient unaligned memory access: "]) -AS_IF([test "x$NO_UNALIGNED_ACCESS" != "x1"], [AS_ECHO(["yes"])], [AS_IF([test "x$UNSUPPORTED_ARCH" != "x1"], [AS_ECHO(["no"])], [AS_ECHO(["unknown"])])]) -AS_IF([test "x$UNSUPPORTED_ARCH" = "x1"], [AC_MSG_WARN([Your architecture ($host_cpu) is unsupported, using safe default of no unaligned access])]) +# Print the bindir and libdir this `make install' will install into. AS_ECHO +PPRINT_SUBTITLE([Install directories]) +PPRINT_PROP_STRING([Binaries], [$report_bindir]) +PPRINT_PROP_STRING([Libraries], [$report_libdir]) -AS_ECHO(["Type 'make' to compile."]) +AS_ECHO +PPRINT_SUBTITLE([System directories]) + +PPRINT_PROP_STRING([lttng-sessiond rundir], [$lttng_system_rundir]) + +PPRINT_SET_INDENT(0) + +AS_IF([test "x$warn_prebuilt_man_pages" = "xyes" ], [ + AS_ECHO + PPRINT_WARN([Both asciidoc and xmlto are needed to build the LTTng-UST man pages. +Note that the man pages are already built in this distribution tarball, +therefore asciidoc and xmlto are only needed if you intend to modify +their sources. + +Use --disable-man-pages to completely disable building and installing +the man pages.]) +])