X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=a58a5da5866a57a8be91a2a962d5c71217c63b00;hb=refs%2Fheads%2Fstable-2.2;hp=7f12f23ff5f5cbb2873e282dd7c097a3e8920c08;hpb=8fb0c941d4b87505608faa4af4d59300c4a8950c;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 7f12f23f..a58a5da5 100644 --- a/configure.ac +++ b/configure.ac @@ -1,14 +1,19 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([lttng-ust],[2.1.0-rc1],[mathieu dot desnoyers at efficios dot com]) +AC_INIT([lttng-ust],[2.2.3],[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 @@ -34,8 +39,8 @@ 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="Basse Messe" -version_description="Light coloured German ale whose style was named after the city Cologne (Koln) where it was first brewed. It is a rather simple beer with lightly fruity aromas and a delicate hoppy fragrance. The beer has a pronounced malty taste with a subtle bitter aftertaste" +version_name="Cuda" +version_description="Brewed at the Benelux microbrewery, this IPA has huge floral, citric and resinous hop aroma, simply an amazing nose. The flavor is very fresh with a light caramel malting touch completing a strong body. Huge amounts of hops, lots of grapefruit, lemon and oranges. This is an outstanding IPA!" AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name]) AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description]) @@ -72,6 +77,18 @@ 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([], [])], + [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"]) + ## Checks for libraries. AC_CHECK_LIB([dl], [dlopen], [ @@ -92,27 +109,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]) @@ -170,69 +166,25 @@ 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) - -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 @@ -296,23 +248,6 @@ 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_CONFIG_FILES([ Makefile doc/Makefile @@ -327,16 +262,13 @@ AC_CONFIG_FILES([ liblttng-ust-fork/Makefile liblttng-ust-java/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/daemon/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 lttng-ust.pc ]) @@ -349,7 +281,6 @@ 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): ")