X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=9141bb777b7ae34530faec53aac2a38ea51f7216;hb=26752e5ddc0333150a38a4668bcaced571833628;hp=6a19fc2026c053373e4ce19a57b86daf18faaaf8;hpb=5a67344622044d35ae424565e03aec25221cae58;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 6a19fc20..9141bb77 100644 --- a/configure.ac +++ b/configure.ac @@ -3,13 +3,13 @@ dnl Process this file with autoconf to produce a configure script. dnl Version infos m4_define([V_MAJOR], [2]) -m4_define([V_MINOR], [8]) -m4_define([V_PATCH], [0]) -m4_define([V_EXTRA], [rc1]) +m4_define([V_MINOR], [9]) +m4_define([V_PATCH], [2]) +dnl m4_define([V_EXTRA], []) m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH]) m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])]) -m4_define([V_NAME], [[Isseki Nicho]]) -m4_define([V_DESC], [[The result of a collaboration between "Dieu du Ciel!" and Nagano-based "Shiga Kogen", Isseki Nicho is a strong Imperial Dark Saison offering a rich roasted malt flavor combined with a complex fruity finish typical of Saison yeasts.]]) +m4_define([V_NAME], [[Joannès]]) +m4_define([V_DESC], [[Berliner Weisse style beer from the Trèfle Noir microbrewery in Rouyn-Noranda. It is a tangy beer with a distinct pink dress and intense fruit flavor, thanks to the presence of fresh blackcurrant grown in Témiscamingue.]]) AC_INIT([lttng-ust], V_STRING, [mathieu dot desnoyers at efficios dot com]) @@ -49,6 +49,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], [ @@ -79,6 +80,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,19 +125,32 @@ 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"]) 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]) @@ -171,8 +187,6 @@ dnl AC_CHECK_TYPES([ptrdiff_t]) 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. @@ -208,18 +222,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]) ]) @@ -297,10 +304,13 @@ AS_IF([test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || te 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" ]) AS_IF([test "x$java_agent_log4j" = "xyes"], [ @@ -435,6 +445,10 @@ AC_DEFUN([_AC_DEFINE_AND_SUBST], [ _AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000]) +AM_CFLAGS="-Wall" +AC_SUBST(AM_CFLAGS) +AC_SUBST(JNI_CPPFLAGS) + AC_CONFIG_FILES([ Makefile doc/Makefile @@ -449,6 +463,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 @@ -503,16 +518,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"])])