X-Git-Url: http://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=437d71961871ec30fe9405b05fe933817aced698;hb=85f8af7b80f5d52ab099e7f73d3ac8f59c6bb1e9;hp=7c2dd90262331933451bb788701dc31a423a8ee5;hpb=18a76df9471a85f29dcf1ed4dbce5e1db5e6e675;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 7c2dd902..437d7196 100644 --- a/configure.ac +++ b/configure.ac @@ -7,12 +7,12 @@ dnl Process this file with autoconf to produce a configure script. # Project version information m4_define([ust_version_major], [2]) -m4_define([ust_version_minor], [13]) +m4_define([ust_version_minor], [14]) m4_define([ust_version_patch], [0]) m4_define([ust_version_dev_stage], [-pre]) m4_define([ust_version], ust_version_major[.]ust_version_minor[.]ust_version_patch[]ust_version_dev_stage) -m4_define([ust_version_name], [[Codename TBD]]) -m4_define([ust_version_description], [[Description TBD]]) +m4_define([ust_version_name], [[O-Beer]]) +m4_define([ust_version_description], [[An alcoholic drink made from yeast-fermented malt flavored with hops.]]) # Library version information of "liblttng-ust" # Following the numbering scheme proposed by libtool for the library version @@ -135,6 +135,56 @@ AC_TYPE_UINT64_T AC_TYPE_UINT8_T AC_CHECK_TYPES([ptrdiff_t]) +# Detect warning flags supported by the C compiler and append them to +# WARN_CFLAGS. +m4_define([WARN_FLAGS_LIST], [ dnl + -Wall dnl + -Wextra dnl + -Wmissing-prototypes dnl + -Wmissing-declarations dnl + -Wnull-dereference dnl + -Wundef dnl + -Wshadow dnl + -Wjump-misses-init dnl + -Wsuggest-attribute=format dnl + -Wtautological-constant-out-of-range-compare dnl + -Wnested-externs dnl + -Wwrite-strings dnl + -Wformat=2 dnl + -Wstrict-aliasing dnl + -Wmissing-noreturn dnl + -Winit-self dnl + -Wduplicated-cond dnl + -Wduplicated-branches dnl + -Wlogical-op dnl + dnl These would require reworking the tracepoint macros + dnl-Wredundant-decls dnl + -Wno-sign-compare dnl + -Wno-missing-field-initializers dnl + -Wno-null-dereference dnl + -Wno-gnu dnl Disable warnings for GNU extensions on Clang +]) + +# Pass -Werror as an extra flag during the test: this is needed to make the +# -Wunknown-warning-option diagnostic fatal with clang. +AC_LANG_PUSH([C]) +AX_APPEND_COMPILE_FLAGS([WARN_FLAGS_LIST], [WARN_CFLAGS], [-Werror]) +AC_LANG_POP([C]) + +# The test used in AX_APPEND_COMPILE_FLAGS, generated using AC_LANG_PROGRAM, is +# written in such a way that it triggers warnings with the following warning +# flags. So they would always end up disabled if we put them there, because +# the test program would not build. +# +# Enable them here unconditionally. They are supported by GCC >= 4.8 and by +# Clang >= 3.3 (required by the project) and are only valid for C code. +WARN_CFLAGS="${WARN_CFLAGS} -Wold-style-definition -Wstrict-prototypes" + +# Disable 'strict aliasing' if the compiler supports it. +AC_LANG_PUSH([C]) +AX_APPEND_COMPILE_FLAGS([-fno-strict-aliasing], [OPT_CFLAGS], [-Werror]) +AC_LANG_POP([C]) + ## ## ## C++ compiler checks ## @@ -143,6 +193,14 @@ AC_CHECK_TYPES([ptrdiff_t]) # Find an optional C++11 compiler without GNU extensions (-std=c++11) AX_CXX_COMPILE_STDCXX([11], [noext], [optional]) +AS_IF([test "$HAVE_CXX11" = "1"], [ + # Pass -Werror as an extra flag during the test: this is needed to make the + # -Wunknown-warning-option diagnostic fatal with clang. + AC_LANG_PUSH([C++]) + AX_APPEND_COMPILE_FLAGS([WARN_FLAGS_LIST -Wno-undef -Wno-duplicated-branches], [WARN_CXXFLAGS], [-Werror]) + AC_LANG_POP([C++]) +]) + ## ## ## Header checks ## @@ -204,6 +262,7 @@ AC_CHECK_FUNCS([ \ clock_gettime \ ftruncate \ getpagesize \ + gettid \ gettimeofday \ localeconv \ memchr \ @@ -261,10 +320,15 @@ PKG_CHECK_MODULES([URCU], [liburcu >= 0.12]) # Additional variables captured during ./configure AC_ARG_VAR([CLASSPATH], [Java class path]) +AC_ARG_VAR([JAVACFLAGS], [Java compiler flags]) +AC_ARG_VAR([JAVAC], [Java compiler]) +AC_ARG_VAR([JAVAFLAGS], [Java VM flags]) +AC_ARG_VAR([JAVA], [Java VM]) +AC_ARG_VAR([JAVAPREFIX], [prefix where Java runtime is installed]) ## ## -## Optionnal features selection ## +## Optional features selection ## ## ## # numa integration @@ -282,10 +346,15 @@ AE_FEATURE([jni-interface], [build JNI interface between C and Java]) AE_FEATURE_DEFAULT_DISABLE AE_FEATURE([java-agent-jul],[build the LTTng UST Java agent with JUL support]) -# Build the Java Log4j agent +# Build the Java Log4j 1.x agent # Disabled by default AE_FEATURE_DEFAULT_DISABLE -AE_FEATURE([java-agent-log4j],[build the LTTng UST Java agent with Log4j support]) +AE_FEATURE([java-agent-log4j],[build the LTTng UST Java agent with Log4j 1.x support (deprecated)]) + +# Build the Java Log4j 2.x agent +# Disabled by default +AE_FEATURE_DEFAULT_DISABLE +AE_FEATURE([java-agent-log4j2],[build the LTTng UST Java agent with Log4j 2.x support]) # Build both Java agents # Disabled by default @@ -322,9 +391,6 @@ AS_HELP_STRING([--with-lttng-system-rundir], [Location of the system directory w lttng_system_rundir="/var/run/lttng" ]) -# Add the java command line arguments like '--wit-java-prefix' -AX_JAVA_OPTIONS - ## ## ## Check for conflicting features selection ## @@ -337,6 +403,7 @@ AE_IF_FEATURE_DISABLED([shared], [ AE_IF_FEATURE_ENABLED([java-agent-all], [ AE_FEATURE_ENABLE([java-agent-jul]) AE_FEATURE_ENABLE([java-agent-log4j]) + AE_FEATURE_ENABLE([java-agent-log4j2]) ]) @@ -346,7 +413,9 @@ AE_IF_FEATURE_ENABLED([java-agent-all], [ # The numa integration requires libnuma AE_IF_FEATURE_ENABLED([numa], [ - AC_CHECK_LIB([numa], [numa_available], [], [ + AC_CHECK_LIB([numa], [numa_available], [ + AC_DEFINE([HAVE_LIBNUMA], [1], [Define to 1 if libnuma is available.]) + ], [ AC_MSG_ERROR([dnl libnuma is not available. Please either install it (e.g. libnuma-dev) or use [LDFLAGS]=-Ldir to specify the right location, or use --disable-numa configure @@ -356,12 +425,13 @@ argument to disable NUMA support. ]) # The JNI interface and Java Agents require a working Java JDK -AS_IF([AE_IS_FEATURE_ENABLED([jni-interface]) || AE_IS_FEATURE_ENABLED([java-agent-jul]) || AE_IS_FEATURE_ENABLED([java-agent-log4j])], [ +AS_IF([AE_IS_FEATURE_ENABLED([jni-interface]) || AE_IS_FEATURE_ENABLED([java-agent-jul]) || \ + AE_IS_FEATURE_ENABLED([java-agent-log4j]) || AE_IS_FEATURE_ENABLED([java-agent-log4j2])], [ AX_PROG_JAVAC AX_PROG_JAVA AX_PROG_JAR - # Get the CPPFLAGS required to build jni libaries + # Get the CPPFLAGS required to build jni libraries AX_JNI_INCLUDE_DIR for jni_include_dir in $JNI_INCLUDE_DIRS; do JNI_CPPFLAGS="$JNI_CPPFLAGS -I$jni_include_dir" @@ -374,7 +444,7 @@ AS_IF([AE_IS_FEATURE_ENABLED([jni-interface]) || AE_IS_FEATURE_ENABLED([java-age CPPFLAGS="$saved_CPPFLAGS" ]) -# The log4j agent requires the log4j jar in the classpath +# The log4j 1.x agent requires the log4j jar in the classpath AE_IF_FEATURE_ENABLED([java-agent-log4j], [ AX_CHECK_CLASS([org.apache.log4j.Logger]) AS_IF([test "x$ac_cv_class_org_apache_log4j_Logger" = "xno"], [ @@ -388,6 +458,21 @@ Current CLASSPATH: "$CLASSPATH" ]) ]) +# The log4j 2.x agent requires the log4j core and api jars in the classpath +AE_IF_FEATURE_ENABLED([java-agent-log4j2], [ + AX_CHECK_CLASS([org.apache.logging.log4j.Logger]) + AX_CHECK_CLASS([org.apache.logging.log4j.core.Core]) + AS_IF([test "x$ac_cv_class_org_apache_logging_log4j_Logger" = "xno" || test "x$ac_cv_class_org_apache_logging_log4j_core_Core" = "xno"], [ + AC_MSG_ERROR([dnl +The UST Java agent support for log4j was requested but the Log4j classes were +not found. Please specify the location of the Log4j API and core 2.x jars via the Java CLASSPATH +environment variable, e.g. ./configure CLASSPATH="/path/to/log4j-core.jar:/path/to/log4j-api.jar" + +Current CLASSPATH: "$CLASSPATH" + ]) + ]) +]) + # The python agent requires a python interpreter AE_IF_FEATURE_ENABLED([python-agent], [ AS_IF([test "x$PYTHON" = "x"], [ @@ -466,9 +551,11 @@ AC_DEFINE([LTTNG_UST_CTL_LIB_SONAME_MAJOR], [ust_ctl_lib_version_current], [Majo AM_CONDITIONAL([ENABLE_EXAMPLES], AE_IS_FEATURE_ENABLED([examples])) AM_CONDITIONAL([ENABLE_GEN_TP_EXAMPLES], [test "x$PYTHON" != "x"]) -AM_CONDITIONAL([ENABLE_JAVA_AGENT], AE_IS_FEATURE_ENABLED([java-agent-jul]) || AE_IS_FEATURE_ENABLED([java-agent-log4j])) +AM_CONDITIONAL([ENABLE_JAVA_AGENT], AE_IS_FEATURE_ENABLED([java-agent-jul]) || AE_IS_FEATURE_ENABLED([java-agent-log4j]) || AE_IS_FEATURE_ENABLED([java-agent-log4j2])) AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_JUL], AE_IS_FEATURE_ENABLED([java-agent-jul])) AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_LOG4J], AE_IS_FEATURE_ENABLED([java-agent-log4j])) +AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_LOG4J2], AE_IS_FEATURE_ENABLED([java-agent-log4j2])) +AM_CONDITIONAL([ENABLE_JAVA_AGENT_WITH_LOG4J_COMMON], AE_IS_FEATURE_ENABLED([java-agent-log4j]) || AE_IS_FEATURE_ENABLED([java-agent-log4j2])) AM_CONDITIONAL([ENABLE_JNI_INTERFACE], AE_IS_FEATURE_ENABLED([jni-interface])) AM_CONDITIONAL([ENABLE_MAN_PAGES], AE_IS_FEATURE_ENABLED([man-pages])) AM_CONDITIONAL([ENABLE_NUMA], AE_IS_FEATURE_ENABLED([numa])) @@ -492,10 +579,10 @@ AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], ust_ctl_lib_version) # Major soname for python-lttngust AC_SUBST([LTTNG_UST_LIB_SONAME_MAJOR], [ust_lib_version_current]) -AM_CFLAGS="-Wall $URCU_CFLAGS $PTHREAD_CFLAGS" +AM_CFLAGS="$OPT_CFLAGS $WARN_CFLAGS $URCU_CFLAGS $PTHREAD_CFLAGS" AC_SUBST(AM_CFLAGS) -AM_CXXFLAGS="$AM_CFLAGS" +AM_CXXFLAGS="$WARN_CXXFLAGS $URCU_CFLAGS $PTHREAD_CFLAGS" AC_SUBST(AM_CXXFLAGS) # The order in which the include folders are searched is important. @@ -517,47 +604,59 @@ AC_CONFIG_FILES([ doc/examples/Makefile doc/Makefile doc/man/Makefile + extras/Makefile include/Makefile src/common/Makefile - src/libcounter/Makefile - src/liblttng-ust-comm/Makefile - src/liblttng-ust-ctl/Makefile + src/lib/lttng-ust-common/Makefile + src/lib/lttng-ust-ctl/Makefile src/lib/lttng-ust-cyg-profile/Makefile - src/liblttng-ust-dl/Makefile - src/liblttng-ust-fd/Makefile + src/lib/lttng-ust-dl/Makefile + src/lib/lttng-ust-fd/Makefile src/lib/lttng-ust-fork/Makefile - src/liblttng-ust-java-agent/java/lttng-ust-agent-all/Makefile - src/liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile - src/liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile - src/liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile - src/liblttng-ust-java-agent/java/Makefile - src/liblttng-ust-java-agent/jni/common/Makefile - src/liblttng-ust-java-agent/jni/jul/Makefile - src/liblttng-ust-java-agent/jni/log4j/Makefile - src/liblttng-ust-java-agent/jni/Makefile - src/liblttng-ust-java-agent/Makefile - src/liblttng-ust-java/Makefile + src/lib/lttng-ust-java-agent/java/lttng-ust-agent-all/Makefile + src/lib/lttng-ust-java-agent/java/lttng-ust-agent-common/Makefile + src/lib/lttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile + src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile + src/lib/lttng-ust-java-agent/java/lttng-ust-agent-log4j2/Makefile + src/lib/lttng-ust-java-agent/java/Makefile + src/lib/lttng-ust-java-agent/jni/common/Makefile + src/lib/lttng-ust-java-agent/jni/jul/Makefile + src/lib/lttng-ust-java-agent/jni/log4j/Makefile + src/lib/lttng-ust-java-agent/jni/Makefile + src/lib/lttng-ust-java-agent/Makefile + src/lib/lttng-ust-java/Makefile src/lib/lttng-ust-libc-wrapper/Makefile - src/liblttng-ust/Makefile + src/lib/lttng-ust-pthread-wrapper/Makefile + src/lib/lttng-ust-tracepoint/Makefile + src/lib/lttng-ust/Makefile src/lib/lttng-ust-python-agent/Makefile src/lib/Makefile - src/libringbuffer/Makefile - src/lttng-ust-ctl.pc - src/lttng-ust.pc + src/lib/lttng-ust-ctl.pc + src/lib/lttng-ust.pc src/Makefile src/python-lttngust/lttngust/version.py src/python-lttngust/Makefile src/python-lttngust/setup.py tests/benchmark/Makefile - tests/compile/ctf-types/Makefile - tests/compile/hello.cxx/Makefile - tests/compile/hello/Makefile - tests/compile/hello-many/Makefile + tests/compile/api0/ctf-types/Makefile + tests/compile/api0/hello.cxx/Makefile + tests/compile/api0/hello/Makefile + tests/compile/api0/hello-many/Makefile + tests/compile/api0/Makefile + tests/compile/api0/same_line_tracepoint/Makefile + tests/compile/api1/ust-fields/Makefile + tests/compile/api1/hello.cxx/Makefile + tests/compile/api1/hello/Makefile + tests/compile/api1/hello-many/Makefile + tests/compile/api1/Makefile + tests/compile/api1/same_line_tracepoint/Makefile + tests/compile/api1/test-app-ctx/Makefile tests/compile/Makefile - tests/compile/same_line_tracepoint/Makefile - tests/compile/test-app-ctx/Makefile tests/Makefile + tests/regression/abi0-conflict/Makefile + tests/regression/Makefile tests/unit/gcc-weak-hidden/Makefile + tests/unit/libcommon/Makefile tests/unit/libmsgpack/Makefile tests/unit/libringbuffer/Makefile tests/unit/Makefile @@ -592,9 +691,9 @@ AS_ECHO AS_IF([test -n "ust_version_description"], [ AS_IF([test -n "$FOLD"], [ - AS_ECHO("`AS_ECHO("ust_version_description") | $FOLD -s`") + AS_ECHO(["ust_version_description"]) | $FOLD -s ], [ - AS_ECHO("ust_version_description") + AS_ECHO(["ust_version_description"]) ]) AS_ECHO ]) @@ -618,7 +717,10 @@ AE_IS_FEATURE_ENABLED([java-agent-jul]) && value=1 || value=0 PPRINT_PROP_BOOL_CUSTOM([Java agent (JUL support)], $value, [use --enable-java-agent-jul]) AE_IS_FEATURE_ENABLED([java-agent-log4j]) && value=1 || value=0 -PPRINT_PROP_BOOL_CUSTOM([Java agent (Log4j support)], $value, [use --enable-java-agent-log4j]) +PPRINT_PROP_BOOL_CUSTOM([Java agent (Log4j 1.x support (deprecated))], $value, [use --enable-java-agent-log4j]) + +AE_IS_FEATURE_ENABLED([java-agent-log4j2]) && value=1 || value=0 +PPRINT_PROP_BOOL_CUSTOM([Java agent (Log4j 2.x support)], $value, [use --enable-java-agent-log4j2]) AE_IS_FEATURE_ENABLED([jni-interface]) && value=1 || value=0 PPRINT_PROP_BOOL_CUSTOM([JNI interface (JNI)], $value, [use --enable-jni-interface])