X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=configure.ac;h=77b5db407558ab7962e0ee52ca107920d7b0bc02;hp=f84f42643ce9cefddc87aca85a6c77ab4f428160;hb=c7667bfebfa1d054ad8d54fd98ada3c86184e327;hpb=f1d4b8107c7bc613be855c6b0b15c4405e1edbf2 diff --git a/configure.ac b/configure.ac index f84f4264..77b5db40 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,17 @@ -# -*- Autoconf -*- -# Process this file with autoconf to produce a configure script. +dnl -*- Autoconf -*- +dnl Process this file with autoconf to produce a configure script. -AC_INIT([lttng-ust],[2.6.0-rc1],[mathieu dot desnoyers at efficios dot com]) +dnl Version infos +m4_define([V_MAJOR], [2]) +m4_define([V_MINOR], [10]) +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], [[KeKriek]]) +m4_define([V_DESC], [[From Brasserie Dunham, a sour mashed golden wheat ale fermented with local sour cherries from Tougas orchards. Fresh sweet cherry notes with some tartness, lively carbonation with a dry finish.]]) + +AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com]) # Following the numbering scheme proposed by libtool for the library version # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html @@ -12,154 +22,166 @@ AC_SUBST([LTTNG_UST_LIBRARY_VERSION], [0:0:0]) # 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]) +AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [3:0:1]) 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_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_SRCDIR([include/lttng/tracepoint.h]) +AC_REQUIRE_AUX_FILE([tap-driver.sh]) + # 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]) -# Compute minor/major/patchlevel version numbers -AC_PROG_SED -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/') -AC_SUBST([MAJOR_VERSION], [$major_version]) -AC_SUBST([MINOR_VERSION], [$minor_version]) -AC_SUBST([PATCHLEVEL_VERSION], [$patchlevel_version]) -AC_DEFINE_UNQUOTED([VERSION_MAJOR], $major_version, [UST major version number]) -AC_DEFINE_UNQUOTED([VERSION_MINOR], $minor_version, [UST minor version number]) -AC_DEFINE_UNQUOTED([VERSION_PATCHLEVEL], $patchlevel_version, [UST patchlevel version number]) - -version_name="Gaia" -version_description="From Benelux brewery in Montreal, the Gaia is a witbier with a cloudy light amber ale color. Aroma of coriander with floral hay notes is enchanting. Taste is also dominated by the very floral coriander note and some medium sweet malt notes." - -AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name]) -AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description]) +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]) +AC_PROG_SED AC_PROG_GREP AC_PROG_LN_S +AC_PROG_MKDIR_P + # 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_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]) + ]) +]) AM_CONDITIONAL([NO_SHARED], [test "x$enable_shared" = "xno"]) # Checks for programs. 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 # 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++]) - AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], - [check_cxx_designated_initializers=yes], - [rw_cv_prog_cxx_works=no]) - if test "$check_cxx_designated_initializers" = "yes"; then - 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 - ]) - fi - AC_LANG_POP([C++])]) +AC_CACHE_CHECK([whether the C++ compiler works], [rw_cv_prog_cxx_works], [ + AC_LANG_PUSH([C++]) + + AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])], [ + check_cxx_designated_initializers=yes + ], [ + rw_cv_prog_cxx_works=no + ]) + + 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 + ]) + ]) + + AC_LANG_POP([C++]) +]) AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) # Check if the compiler support weak symbols AX_SYS_WEAK_ALIAS -if test "x${ax_cv_sys_weak_alias}" = "xno"; then - AC_MSG_ERROR([Your platform doesn't support weak symbols.]) -fi +AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [ + AC_MSG_ERROR([Your platform doesn't support weak symbols.]) +]) -## Checks for libraries. -AC_CHECK_LIB([dl], [dlopen], -[ +# Checks for libraries. +AC_CHECK_LIB([dl], [dlopen], [ have_libdl=yes -], -[ + libdl_name=dl +], [ #libdl not found, check for dlopen in libc. - AC_CHECK_LIB([c], [dlopen], - [ + AC_CHECK_LIB([c], [dlopen], [ have_libc_dl=yes - ], - [ + libdl_name=c + ], [ AC_MSG_ERROR([Cannot find dlopen in libdl nor libc. Use [LDFLAGS]=-Ldir to specify their location.]) ]) ]) + +# Check if libdl has dlmopen support. +AH_TEMPLATE([HAVE_DLMOPEN], ["Define to 1 if dlmopen is available."]) +AC_CHECK_LIB([$libdl_name], [dlmopen], + [AC_DEFINE([HAVE_DLMOPEN], [1])] +) + 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"]) +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" +]) + AM_CONDITIONAL([HAVE_DLINFO], [test "x${ac_cv_have_decl_RTLD_DI_LINKMAP}" = "xyes"]) # Checks for header files. -#AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) +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 -#AC_TYPE_INT16_T -#AC_TYPE_INT32_T -#AC_TYPE_INT64_T -#AC_TYPE_INT8_T -#AC_TYPE_PID_T -#AC_TYPE_SIZE_T -#AC_TYPE_SSIZE_T -#AC_TYPE_UINT16_T -#AC_TYPE_UINT32_T -#AC_TYPE_UINT64_T -#AC_TYPE_UINT8_T -#AC_CHECK_TYPES([ptrdiff_t]) +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 @@ -180,18 +202,17 @@ liburcu-cds lib, part of Userspace RCU 0.7 or better. Use [LDFLAGS]=-Ldir to spe AC_MSG_CHECKING([caa_likely()]) AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -#include -void fct(void) -{ - if (caa_likely(1)) { + #include + void fct(void) + { + if (caa_likely(1)) { + } } -} -]])],[ +]])], [ AC_MSG_RESULT([yes]) -],[ +], [ AC_MSG_RESULT([no]) AC_MSG_ERROR([Please upgrade your version of liburcu to 0.6.6 or better]) - ]) # urcu - check that URCU lib is available to compilation @@ -203,168 +224,233 @@ AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer i # optional linux/perf_event.h AC_CHECK_HEADERS([linux/perf_event.h], [have_perf_event=yes], []) -# Perf event counters are only supported on x86 so far. -AC_MSG_CHECKING([UST support for architecture perf event counters]) -case $host_cpu in -changequote(,)dnl - i[3456]86) -changequote([,])dnl - UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS=yes;; - x86_64) UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS=yes;; - amd64) UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS=yes;; - *) UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS=no;; -esac -AC_MSG_RESULT([$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS]) - -AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$have_perf_event" = "xyes" -a "x$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS" = "xyes"]) - -if test "x$have_perf_event" = "xyes" -a "x$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS" = "xyes"; then -AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1]) -fi +# 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"]) + +AS_IF([test "x$have_perf_event" = "xyes"], [ + AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1]) +]) AC_MSG_CHECKING([host system alignment requirements]) -case $host_cpu in -changequote(,)dnl - i[3456]86) -changequote([,])dnl - ;; - x86_64) ;; - amd64) ;; - powerpc) ;; - ppc64) ;; - ppc64le) ;; - powerpc64) ;; - powerpc64le) ;; - s390) NO_UNALIGNED_ACCESS=1 ;; - s390x) NO_UNALIGNED_ACCESS=1 ;; - arm*) NO_UNALIGNED_ACCESS=1 ;; - mips*) NO_UNALIGNED_ACCESS=1 ;; - tile*) NO_UNALIGNED_ACCESS=1 ;; - *) AC_MSG_ERROR([unable to detect alignment requirements (unsupported architecture ($host_cpu)?)]) ;; -esac +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]) -if test x$NO_UNALIGNED_ACCESS = x ; then -AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) -fi +AS_IF([test "x$NO_UNALIGNED_ACCESS" = "x"], [ + AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) +]) # 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]])], - [jni_interface=$withval], - [jni_interface=no] -) +AC_ARG_ENABLE([jni-interface], [ + 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"]) -AC_ARG_ENABLE([java-agent-jul], - [AS_HELP_STRING([--enable-java-agent-jul],[build the LTTng UST Java agent with JUL support [default=no]])], - [java_agent_jul=$enableval], - [java_agent_jul=no] -) - -AC_ARG_ENABLE([java-agent-log4j], - [AS_HELP_STRING([--enable-java-agent-log4j],[build the LTTng UST Java agent with Log4j support [default=no]])], - [java_agent_log4j=$enableval], - [java_agent_log4j=no] -) +AC_ARG_ENABLE([java-agent-jul], [ + AS_HELP_STRING([--enable-java-agent-jul], [build the LTTng UST Java agent with JUL support [default=no]]) +], [ + java_agent_jul=$enableval +], [ + java_agent_jul=no +]) -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]])], - [java_agent_jul=$enableval - java_agent_log4j=$enableval], - [:] -) +AC_ARG_ENABLE([java-agent-log4j], [ + AS_HELP_STRING([--enable-java-agent-log4j], [build the LTTng UST Java agent with Log4j support [default=no]]) +], [ + java_agent_log4j=$enableval +], [ + java_agent_log4j=no +]) +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]]) +], [ + 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"]) -if test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"; then - AX_JAVA_OPTIONS - AX_PROG_JAVAC - AX_PROG_JAVA - AX_PROG_JAR - - AX_JNI_INCLUDE_DIR - for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS - do - CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR" - done +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 - AX_PROG_JAVAH -fi + AX_JNI_INCLUDE_DIR + for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS + do + CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR" + done -if test "x$java_agent_log4j" = "xyes"; then - AX_CHECK_CLASSPATH - - AX_CHECK_CLASS(org.apache.log4j.Logger) + AX_PROG_JAVAH +]) - if test "x$ac_cv_class_org_apache_log4j_Logger" = "xno"; then - AC_MSG_ERROR([The UST Java agent support for log4j was requested but the Log4j classes were not found. Please specify the location of the Log4j jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/log4j.jar"]) - fi -fi +AS_IF([test "x$java_agent_log4j" = "xyes"], [ + AX_CHECK_CLASSPATH + AX_CHECK_CLASS([org.apache.log4j.Logger]) + AS_IF([test "x$ac_cv_class_org_apache_log4j_Logger" = "xno"], [ + AC_MSG_ERROR([The UST Java agent support for log4j was requested but the Log4j classes were not found. Please specify the location of the Log4j jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/log4j.jar"]) + ]) +]) # 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]])], - [python_agent=$enableval], - [:] -) +AC_ARG_ENABLE([python-agent], [ + 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]) +]) # sdt.h integration -AC_ARG_WITH([sdt], - [AS_HELP_STRING([--with-sdt],[provide SystemTap integration via sdt.h [default=no]])], - [with_sdt=$withval], - [with_sdt="no"] -) +AC_ARG_WITH([sdt], [ + AS_HELP_STRING([--with-sdt], [provide SystemTap integration via sdt.h [default=no]]) +], [ + with_sdt=$withval +], [ + with_sdt="no" +]) -AS_IF([test "x$with_sdt" = "xyes"],[ +AS_IF([test "x$with_sdt" = "xyes"], [ AC_MSG_CHECKING([STAP_PROBEV()]) AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ - #define SDT_USE_VARIADIC - #include - void fct(void) - { - STAP_PROBEV(provider,name,1,2,3,4,5,6,7,8,9,10); - } - ]])],[ + #define SDT_USE_VARIADIC + #include + void fct(void) + { + STAP_PROBEV(provider,name,1,2,3,4,5,6,7,8,9,10); + } + ]])], [ AC_MSG_RESULT([yes]) AC_DEFINE([LTTNG_UST_HAVE_SDT_INTEGRATION], [1]) - ],[ + ], [ AC_MSG_RESULT([no]) AC_MSG_ERROR([The sdt.h integration was requested but the STAP_PROBEV define cannot be used. Make sure it is installed, and up to date, or use CPPFLAGS=-I/path/ to specify a non-standard path to sys/sdt.h]) ]) ]) 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]) - ]) +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".]), - [lttng_system_rundir="$withval"], - [lttng_system_rundir="/var/run/lttng"]) +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".]), +], [ + lttng_system_rundir="$withval" +], [ + lttng_system_rundir="/var/run/lttng" +]) AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], - [LTTng system runtime directory]) + [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"]) + +# 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"]) + +# Enable building man pages (user's intention). +AC_ARG_ENABLE( + man-pages, + AS_HELP_STRING( + [--disable-man-pages], + [Do not build and install man pages (already built in a distributed tarball)] + ), + [man_pages_opt=$enableval], + [man_pages_opt=yes] +) + +# Check for asciidoc and xmlto if we enabled building the man pages. +have_asciidoc_xmlto=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"], [ + # 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 + # to build the man pages. + AC_MSG_ERROR([ +Both asciidoc and xmlto are needed to build the LTTng-UST man pages. Use +--disable-man-pages to disable building the man pages, in which case +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. + ]) + ]) + ], [ + have_asciidoc_xmlto=yes + ]) +]) -AM_PATH_PYTHON([2.7],BUILD_GEN_TP_EXAMPLES=1,[:]) -AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test $BUILD_GEN_TP_EXAMPLES], [Build examples requiring lttng-gen-tp]) +# 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([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]) AC_CONFIG_FILES([ Makefile doc/Makefile doc/examples/Makefile + doc/man/Makefile include/Makefile include/lttng/ust-version.h snprintf/Makefile @@ -374,53 +460,80 @@ AC_CONFIG_FILES([ liblttng-ust-ctl/Makefile liblttng-ust-fork/Makefile liblttng-ust-dl/Makefile + liblttng-ust-fd/Makefile liblttng-ust-java/Makefile liblttng-ust-java-agent/Makefile liblttng-ust-java-agent/java/Makefile + liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile + liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile + liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile + liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile liblttng-ust-java-agent/jni/Makefile + liblttng-ust-java-agent/jni/common/Makefile liblttng-ust-java-agent/jni/jul/Makefile liblttng-ust-java-agent/jni/log4j/Makefile liblttng-ust-libc-wrapper/Makefile liblttng-ust-cyg-profile/Makefile liblttng-ust-python-agent/Makefile + python-lttngust/Makefile + python-lttngust/setup.py + 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/benchmark/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 +]) + AC_OUTPUT -AS_ECHO() -AS_ECHO("Version name: $version_name") -AS_ECHO("$version_description") +AS_ECHO +AS_ECHO(["m4_bpatsubst(V_NAME, ["], [\\"])"]) +AS_ECHO +AS_ECHO(["m4_bpatsubst(V_DESC, ["], [\\"])"]) # Report on the configuration options -AS_ECHO() -AS_ECHO("LTTng-UST will be built with the following options:") +AS_ECHO +AS_ECHO(["LTTng-UST will be built with the following options:"]) + +AS_ECHO -AS_ECHO() +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)"])]) -AS_ECHO_N("Java agent (JUL support): ") -AS_IF([test "x$java_agent_jul" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")]) +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_ECHO_N("Java agent (Log4j support): ") -AS_IF([test "x$java_agent_log4j" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")]) +AS_ECHO_N(["JNI interface (JNI): "]) +AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled (Use --enable-jni-interface)"])]) -AS_ECHO_N("JNI interface (JNI): ") -AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")]) +AS_ECHO_N(["Python ($PYTHON) agent: "]) +AS_IF([test "x$python_agent" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled (Use --enable-python-agent)"])]) -AS_ECHO_N("Python agent: ") -AS_IF([test "x$python_agent" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")]) +AS_ECHO_N(["sdt.h integration: "]) +AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])]) -AS_ECHO_N("sdt.h integration: ") -AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")]) +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])]) +AS_ECHO -AS_ECHO() -AS_ECHO("Type 'make' to compile.") +AS_ECHO(["Type 'make' to compile."])