X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=99868a62eee849300af4d7b3421db04c271e58b5;hb=093c3f9bbdda113147ab03be62aaa37bd1c786b4;hp=de462ffcc67f329a89752737d2fde0934d2fc012;hpb=01f0e40ce5b0c30c7c0706b63532049b311c83cf;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index de462ffc..99868a62 100644 --- a/configure.ac +++ b/configure.ac @@ -3,15 +3,16 @@ 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_MINOR], [10]) m4_define([V_PATCH], [0]) -m4_define([V_EXTRA], [pre]) +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], [[J-TBD]]) -m4_define([V_DESC], [[]]) +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]) +AC_PREREQ(2.59) +AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com], [], [https://lttng.org]) # Following the numbering scheme proposed by libtool for the library version # http://www.gnu.org/software/libtool/manual/html_node/Updating-version-info.html @@ -22,12 +23,12 @@ 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]) +AC_CONFIG_MACRO_DIR([m4]) 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])]) @@ -49,6 +50,7 @@ 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], [ @@ -60,7 +62,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) @@ -79,6 +81,8 @@ 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 @@ -122,15 +126,23 @@ AS_IF([test "x${ax_cv_sys_weak_alias}" = "xno"], [ # 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], [ 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"]) @@ -213,18 +225,11 @@ 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]) -AS_CASE([$host_cpu], - [i[[3456]]86], [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]) -AC_MSG_RESULT([$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS]) - -AM_CONDITIONAL([HAVE_PERF_EVENT], [test "x$have_perf_event" = "xyes" && test "x$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS" = "xyes"]) +# 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" && test "x$UST_SUPPORT_FOR_ARCH_PERF_EVENT_COUNTERS" = "xyes"], [ +AS_IF([test "x$have_perf_event" = "xyes"], [ AC_DEFINE([LTTNG_UST_HAVE_PERF_EVENT], [1]) ]) @@ -439,6 +444,8 @@ AC_DEFUN([_AC_DEFINE_AND_SUBST], [ ]) _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 @@ -454,6 +461,7 @@ 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 @@ -508,16 +516,16 @@ AS_ECHO(["LTTng-UST will be built with the following options:"]) AS_ECHO AS_ECHO_N(["Java agent (JUL support): "]) -AS_IF([test "x$java_agent_jul" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])]) +AS_IF([test "x$java_agent_jul" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled (Use --enable-java-agent-jul)"])]) AS_ECHO_N(["Java agent (Log4j support): "]) -AS_IF([test "x$java_agent_log4j" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])]) +AS_IF([test "x$java_agent_log4j" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled (Use --enable-java-agent-log4j)"])]) AS_ECHO_N(["JNI interface (JNI): "]) -AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])]) +AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled (Use --enable-jni-interface)"])]) AS_ECHO_N(["Python ($PYTHON) agent: "]) -AS_IF([test "x$python_agent" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])]) +AS_IF([test "x$python_agent" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled (Use --enable-python-agent)"])]) AS_ECHO_N(["sdt.h integration: "]) AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO(["Enabled"])], [AS_ECHO(["Disabled"])])