X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=a62b2aa87e6579b7f2cedb886764ad506b98a59f;hb=e475cf6c8bed7489299dec34ed05d0b8d8c64bcd;hp=d4f879eb5f6f5d1664348fc728b9571a9555e3c4;hpb=272d715a3c8949553be6cf8fd5888a38a60545a9;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index d4f879eb..a62b2aa8 100644 --- a/configure.ac +++ b/configure.ac @@ -1,19 +1,24 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([lttng-ust],[2.0.0-rc1],[mathieu dot desnoyers at efficios dot com]) +AC_INIT([lttng-ust],[2.4.0],[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 +# 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. +# 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_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([config]) -AM_INIT_AUTOMAKE([foreign]) +AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_SRCDIR([include/lttng/tracepoint.h]) @@ -34,6 +39,38 @@ 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="Époque Opaque" +version_description="The Époque Opaque is a black IPA from Trou du Diable brewery. The nose is eerily reminiscent of the coffee crisp candy from of our childhood. These strong mocha accents are present on the palate, which are quickly subdued by Japanese and Australian hops leading to a final state of satisfaction enjoyable for any fan of bitter beer." + +AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name]) +AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description]) + +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], + [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 @@ -41,6 +78,31 @@ AC_PROG_CXX 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++])]) + +AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) + ## Checks for libraries. AC_CHECK_LIB([dl], [dlopen], [ @@ -61,27 +123,6 @@ AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_DL], [test "x$have_libc_dl" = "xyes"]) AC_CHECK_LIB([pthread], [pthread_create]) -# Check for libuuid -AC_CHECK_LIB([uuid], [uuid_generate], -[ - AC_DEFINE_UNQUOTED([LTTNG_UST_HAVE_LIBUUID], 1, [Has libuuid support.]) - have_libuuid=yes -], -[ - # libuuid not found, check for uuid_create in libc. - AC_CHECK_LIB([c], [uuid_create], - [ - AC_DEFINE_UNQUOTED([LTTNG_UST_HAVE_LIBC_UUID], 1, [Has libc uuid support.]) - have_libc_uuid=yes - ], - [ - AC_MSG_ERROR([Cannot find libuuid uuid_generate nor libc uuid_create. Use [LDFLAGS]=-Ldir to specify their location.]) - ]) -] -) -AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBUUID], [test "x$have_libuuid" = "xyes"]) -AM_CONDITIONAL([LTTNG_UST_BUILD_WITH_LIBC_UUID], [test "x$have_libc_uuid" = "xyes"]) - # Checks for header files. #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) @@ -106,19 +147,17 @@ AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol sched_getcpu sysconf] CFLAGS="-Wall $CFLAGS" -# Check for texinfo, required for building the documentation -# TODO: make this (and building the documentation) optional -AC_CHECK_PROG([TEXINFO], [makeinfo], [yes]) -AS_IF([test "x$TEXINFO" != "xyes"],[ - AC_MSG_ERROR([Please install the 'texinfo' program and make sure 'makeinfo' is in the PATH.]) -]) - # 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 @@ -141,69 +180,26 @@ AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find lib # 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.])]) - -# Check for various supplementary host information (beyond the -# triplet) which might affect the library format choices. E.g., we -# can be building with `i686-unknown-linux-gnu-gcc -m64' - -case "${host}" in -changequote(,)dnl - i[34567]86-*-linux*) -changequote([,])dnl - AC_CACHE_CHECK([if building for x86-64], [ust_cv_i386_is_x86_64], - [save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $CFLAGS" - AC_EGREP_CPP([got it], [ -#if __x86_64__ -got it -#endif - ], [ust_cv_i386_is_x86_64=yes], - [ust_cv_i386_is_x86_64=no]) - CPPFLAGS="$save_CPPFLAGS"]) - ;; -esac - -AC_MSG_CHECKING([library format for the host system]) +AC_MSG_CHECKING([host system alignment requirements]) case $host_cpu in changequote(,)dnl i[3456]86) changequote([,])dnl - if test "$ust_cv_i386_is_x86_64" = yes ; then - LIBFORMAT="elf64-x86-64" - else - LIBFORMAT="elf32-i386" - fi ;; - x86_64) LIBFORMAT="elf64-x86-64" ;; - amd64) LIBFORMAT="elf64-x86-64" ;; - powerpc) LIBFORMAT="elf32-powerpc" ;; - ppc64) LIBFORMAT="elf64-powerpc" ;; - powerpc64) LIBFORMAT="elf64-powerpc" ;; - s390) LIBFORMAT="elf32-s390"; NO_UNALIGNED_ACCESS=1 ;; - s390x) LIBFORMAT="elf64-s390"; NO_UNALIGNED_ACCESS=1 ;; - armv5) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;; - arm) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;; - mips*) LIBFORMAT=""; NO_UNALIGNED_ACCESS=1;; - *) AC_MSG_ERROR([unable to detect library format (unsupported architecture ($host_cpu)?)]) ;; + x86_64) ;; + amd64) ;; + powerpc) ;; + ppc64) ;; + powerpc64) ;; + 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 -AC_SUBST(LIBFORMAT) -AC_MSG_RESULT($LIBFORMAT) +AC_MSG_RESULT([$host_cpu]) -if test "x$host_cpu" = "xarm" ; then -AC_MSG_CHECKING([checking for armv5]) -AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ -#ifndef __ARM_ARCH_5TEJ__ -#error "no arm5 here" -#endif -]])],[ - AC_MSG_RESULT([yes]) - NO_UNALIGNED_ACCESS=1 - -],[ - AC_MSG_RESULT([no]) - -]) -fi if test x$NO_UNALIGNED_ACCESS = x ; then AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) fi @@ -214,6 +210,9 @@ AC_ARG_WITH([java-jdk], [JAVA_JDK=$withval], [JAVA_JDK=""] ) +AM_CONDITIONAL([HAVE_JAVA_JDK], [test $JAVA_JDK], [Java JDK path]) +AC_SUBST([JAVA_JDK]) + AS_IF([test $JAVA_JDK],[ AS_IF([test -d $JAVA_JDK],[ AC_MSG_RESULT([using Java includes in $JAVA_SDK]) @@ -267,22 +266,29 @@ AS_IF([test "x$with_sdt" = "xyes"],[ ]) ]) -#currently disabled. - #tests/hello2/Makefile - #tests/basic/Makefile - #tests/simple_include/Makefile - #tests/snprintf/Makefile - #tests/test-nevents/Makefile - #tests/test-libustinstr-malloc/Makefile - #tests/dlopen/Makefile - #tests/same_line_marker/Makefile - #tests/trace_event/Makefile - #tests/tracepoint/Makefile - #tests/tracepoint/benchmark/Makefile - #tests/register_test/Makefile - #tests/libustctl_function_#tests/Makefile - #tests/exit-fast/Makefile - #tests/basic_long/Makefile +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".]), + [lttng_system_rundir="$withval"], + [lttng_system_rundir="/var/run/lttng"]) +AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], + [LTTng system runtime directory]) + +lttnglibjavadir="${libdir}/lttng/java" +AC_SUBST(lttnglibjavadir) + +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]) AC_CONFIG_FILES([ Makefile @@ -296,26 +302,32 @@ AC_CONFIG_FILES([ liblttng-ust/Makefile liblttng-ust-ctl/Makefile liblttng-ust-fork/Makefile + liblttng-ust-dl/Makefile liblttng-ust-java/Makefile + liblttng-ust-jul/Makefile liblttng-ust-libc-wrapper/Makefile + liblttng-ust-cyg-profile/Makefile tools/Makefile tests/Makefile tests/hello/Makefile - tests/hello-static-lib/Makefile tests/hello.cxx/Makefile - tests/demo/Makefile - tests/fork/Makefile - tests/ust-basic-tracing/Makefile - tests/ust-multi-test/Makefile + tests/same_line_tracepoint/Makefile + tests/snprintf/Makefile + tests/benchmark/Makefile + tests/utils/Makefile + tests/java-jul/Makefile lttng-ust.pc ]) AC_OUTPUT +AS_ECHO() +AS_ECHO("Version name: $version_name") +AS_ECHO("$version_description") + # Report on the configuration options AS_ECHO() AS_ECHO("LTTng-UST will be built with the following options:") -AS_ECHO("Library format: $LIBFORMAT") AS_ECHO() AS_ECHO_N("Java support (JNI): ")