X-Git-Url: http://git.lttng.org/?p=lttng-ust.git;a=blobdiff_plain;f=configure.ac;h=73c7b897e522e169437437bba582ffe90e2f6ca7;hp=267a2669dd7d8e5e3a04e94a4fb7ac7f471baba7;hb=167ff4df850ed5c954ee374db66a04b1c9a4ef34;hpb=debef79cc57b53580b1b861e0990ed53da91dcb1 diff --git a/configure.ac b/configure.ac index 267a2669..73c7b897 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -AC_INIT([lttng-ust],[1.9.5],[mathieu dot desnoyers at efficios dot com]) +AC_INIT([lttng-ust],[2.0.6],[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 @@ -13,17 +13,20 @@ 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]) -AC_CONFIG_HEADERS([config.h include/lttng/config.h]) -AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.]) + +# 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/') +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]) @@ -31,6 +34,37 @@ 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]) + +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 @@ -43,9 +77,25 @@ 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.])] +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 its 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]) @@ -67,21 +117,14 @@ 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()]) @@ -126,6 +169,10 @@ got it [ust_cv_i386_is_x86_64=no]) CPPFLAGS="$save_CPPFLAGS"]) ;; + # All symbols must be resolved at link time on Cygwin/MinGW/Windows, + # else libtool will not be able to build shared libraries. + *-*-cygwin*) + LDFLAGS="-Wl,-no-undefined $LDFLAGS";; esac AC_MSG_CHECKING([library format for the host system]) @@ -169,7 +216,7 @@ AC_COMPILE_IFELSE([AC_LANG_SOURCE([[ ]) 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 @@ -182,29 +229,38 @@ 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` - CFLAGS+=" " - CFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done` - CFLAGS+=" " + 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], - [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] +# 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$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 the --with-java-jdk=DIR flag to point to your Java include files, or disable the JNI interface.]) +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]) ]) ]) -AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"]) #currently disabled. #tests/hello2/Makefile @@ -223,8 +279,19 @@ AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"]) #tests/exit-fast/Makefile #tests/basic_long/Makefile +# liblttng-ust-java/Makefile + +# Disabled for now, because these libraries +# rely on the dlsym(3) RTLD_NEXT GNU extension. +# This is not implemented in Cygwin. +#liblttng-ust-fork/Makefile +#liblttng-ust-libc-wrapper/Makefile +#tests/fork/Makefile + AC_CONFIG_FILES([ Makefile + doc/Makefile + doc/examples/Makefile include/Makefile include/lttng/ust-version.h snprintf/Makefile @@ -232,16 +299,32 @@ AC_CONFIG_FILES([ liblttng-ust-comm/Makefile liblttng-ust/Makefile liblttng-ust-ctl/Makefile - liblttng-ust-fork/Makefile - liblttng-ust-java/Makefile - liblttng-ust-libc/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 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("sdt.h integration: ") +AS_IF([test "x$with_sdt" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")]) + +AS_ECHO() +AS_ECHO("Type 'make' to compile.") +