X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=configure.ac;h=f0fcdb40d9a980ffc50bb4c2b5c97c328af183e0;hp=dbfdecdecaaf4f5ee3d4219ffc0200d175b975e8;hb=9d36f30e825135d8fbb3ba6cb31ab10aa938b135;hpb=2b6f8df951cb74149a9ab9c5146e6dd8498b9e87 diff --git a/configure.ac b/configure.ac index dbfdecde..f0fcdb40 100644 --- a/configure.ac +++ b/configure.ac @@ -1,34 +1,59 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([ust], [1.9.0], [mathieu dot desnoyers at efficios dot com]) +AC_INIT([lttng-ust],[2.0.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 +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. + 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/ust/tracepoint.h]) -AC_CONFIG_HEADERS([config.h include/ust/config.h]) -AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.]) -# Compute minor/major version numbers -major_version=`echo AC_PACKAGE_VERSION | sed 's/\..*//'` -minor_version=`echo AC_PACKAGE_VERSION | sed 's/.*\.//' | sed 's/^0//'` +AC_CONFIG_SRCDIR([include/lttng/tracepoint.h]) + +# 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]) + +# 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="Annedd'ale" +version_description="New type of beer, 100% from Quebec, flavored with sapin beaumier needles, with a touch of hops." +AC_DEFINE_UNQUOTED([VERSION_NAME], [$version_name], [UST version name]) +AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], [$version_description], [UST version description]) # Checks for programs. AC_PROG_CC +AC_PROG_CXX AC_PROG_MAKE_SET -AC_PROG_LIBTOOL +LT_INIT ## Checks for libraries. AC_CHECK_LIB([dl], [dlopen]) AC_CHECK_LIB([pthread], [pthread_create]) +# Check for libuuid +AC_CHECK_LIB([uuid], [uuid_generate], [], + [AC_MSG_ERROR([Cannot find libuuid. Use [LDFLAGS]=-Ldir to specify its location.])] +) + # Checks for header files. #AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h]) @@ -49,16 +74,39 @@ AC_C_INLINE # Checks for library functions. AC_FUNC_MALLOC -AC_CHECK_FUNCS([gettimeofday munmap socket strerror strtol]) +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 [CFLAGS]=-Idir to specify their location. +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.])]) +AC_MSG_CHECKING([caa_likely()]) +AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ +#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 AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])]) @@ -101,11 +149,12 @@ changequote([,])dnl x86_64) LIBFORMAT="elf64-x86-64" ;; powerpc) LIBFORMAT="elf32-powerpc" ;; ppc64) LIBFORMAT="elf64-powerpc" ;; - s390) LIBFORMAT="elf32-s390" ;; - s390x) LIBFORMAT="elf64-s390" ;; + 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" ;; - mips*) LIBFORMAT="" ;; + 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)?)]) ;; esac AC_SUBST(LIBFORMAT) @@ -113,90 +162,143 @@ AC_MSG_RESULT($LIBFORMAT) if test "x$host_cpu" = "xarm" ; then AC_MSG_CHECKING([checking for armv5]) -AC_TRY_COMPILE( -[ -], -[ +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([HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) +AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) fi # Set compile flags to java include files if given -AC_ARG_WITH(java_jdk, [ --with-java-jdk=DIR use java jdk from DIR. Ex : $JAVA_HOME.], JAVA_SDK=$withval,) -if test $JAVA_SDK; then - if test -d $JAVA_SDK; then - AC_MSG_RESULT([using java include in $JAVA_SDK]) - SUBDIRS=`find $JAVA_SDK/include -type d` - CFLAGS+=" " - CFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done` - CFLAGS+=" " - else - AC_MSG_ERROR(Unable to find java include file in $JAVA_JDK) - fi -fi +AC_ARG_WITH([java-jdk], + [AS_HELP_STRING([--with-java-jdk=DIR],[use the Java JDK in DIR. Ex : $JAVA_HOME.])], + [JAVA_JDK=$withval], + [JAVA_JDK=""] +) +AS_IF([test $JAVA_JDK],[ + AS_IF([test -d $JAVA_JDK],[ + AC_MSG_RESULT([using Java includes in $JAVA_SDK]) + SUBDIRS=`find $JAVA_JDK/include -type d` + CPPFLAGS+=" " + CPPFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done` + CPPFLAGS+=" " + ],[ + AC_MSG_ERROR(Unable to find Java include files in $JAVA_JDK) + ]) +]) # Check for JNI header files if requested -AC_ARG_WITH(jni-interface, [ --with-jni-interface build JNI interface between C and java. Need java include files. - [[default=no]]]) - -if test -z "$with_jni_interface"; then - with_jni_interface=${with_jni_interface_default-no} -fi +AC_ARG_WITH([jni-interface], + [AS_HELP_STRING([--with-jni-interface],[build JNI interface between C and Java. Needs Java include files [default=no]])], + [jni_interface=$withval], + [jni_interface=no] +) -if test "$with_jni_interface" = "yes"; then - AC_CHECK_HEADERS([jni.h],,AC_MSG_ERROR([ -missing jni.h +AS_IF([test "x$jni_interface" = "xyes"],[ + AC_CHECK_HEADERS([jni.h],[],[ + AC_MSG_ERROR([missing jni.h Make sure Sun Java, OpenJDK or GCJ is installed and that this header file exists in the system path. -Use --with-java-jdk=DIR flag to point to your java include files or desactivate the JNI interface.])) -fi -AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes") +Use the --with-java-jdk=DIR flag to point to your Java include files, or disable the JNI interface.]) + ]) +]) +AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"]) + +# 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"] +) + +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); + } + ]])],[ + 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]) + ]) +]) + +#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 - doc/man/Makefile - doc/info/Makefile + doc/examples/Makefile include/Makefile - liblttng-ust-comm/Makefile + include/lttng/ust-version.h + snprintf/Makefile libringbuffer/Makefile - libust/Makefile + liblttng-ust-comm/Makefile + liblttng-ust/Makefile + liblttng-ust-ctl/Makefile + liblttng-ust-fork/Makefile + liblttng-ust-java/Makefile + liblttng-ust-libc-wrapper/Makefile + tools/Makefile tests/Makefile tests/hello/Makefile - tests/hello2/Makefile - tests/basic/Makefile - tests/basic_long/Makefile + tests/hello-static-lib/Makefile + tests/hello.cxx/Makefile + tests/demo/Makefile tests/fork/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 - libustinstr-malloc/Makefile - libustfork/Makefile - snprintf/Makefile - ust.pc - include/ust/version.h - java/Makefile + tests/ust-basic-tracing/Makefile + tests/ust-multi-test/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): ") +AS_IF([test "x$jni_interface" = "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() +AS_ECHO("Type 'make' to compile.") +