X-Git-Url: https://git.lttng.org/?a=blobdiff_plain;f=configure.ac;h=86bc4c7839d0bb4cce0b1ea1bb89f1b1d82848a5;hb=refs%2Fheads%2Fstable-2.7;hp=175a0a65117039e05f1681940dc50db0bf4009f2;hpb=76831356de1c6784eae8b9cffdc23aa9844e09e1;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 175a0a65..86bc4c78 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],[2.5.0],[mathieu dot desnoyers at efficios dot com]) +AC_INIT([lttng-ust],[2.7.5],[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 @@ -41,13 +41,15 @@ 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="Fumisterie" -version_description="The Fumisterie is a beer whose style is at the confluence of English and German ales. On the palate, it is full-bodied, malty and slightly caramelized. The organic hemp seeds incorporated during the brewing gives it a unique and original taste. The hop flavour comes through delicately in the after taste." +version_name="Herbe à Détourne" +version_description='Brewed with unrestrained amounts of Citra hop, the Herbe à Détourne is a fantastic New World Tripel brewed by "Dieu du Ciel!". Aromas of mango, cantaloupe melon and passion fruit, combined with a controlled bitter finish, unite in making this smooth golden-orange beer stand apart.' +version_description_c=$(echo $version_description | sed 's/"/\\"/g') AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name]) -AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description]) +AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description_c"], [UST version description]) AC_PROG_GREP +AC_PROG_LN_S # 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], @@ -105,6 +107,13 @@ AC_CACHE_CHECK([whether the C++ compiler works], AM_CONDITIONAL([CXX_WORKS], [test "x$rw_cv_prog_cxx_works" = "xyes"]) +# Check if the compiler support weak symbols +AX_SYS_WEAK_ALIAS + +if test "x${ax_cv_sys_weak_alias}" = "xno"; then + AC_MSG_ERROR([Your platform doesn't support weak symbols.]) +fi + ## Checks for libraries. AC_CHECK_LIB([dl], [dlopen], [ @@ -230,9 +239,13 @@ changequote([,])dnl s390) NO_UNALIGNED_ACCESS=1 ;; s390x) NO_UNALIGNED_ACCESS=1 ;; arm*) NO_UNALIGNED_ACCESS=1 ;; + aarch64) 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)?)]) ;; + *) + UNSUPPORTED_ARCH=1 + NO_UNALIGNED_ACCESS=1 + ;; esac AC_MSG_RESULT([$host_cpu]) @@ -240,43 +253,76 @@ if test x$NO_UNALIGNED_ACCESS = x ; then AC_DEFINE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [1]) fi -# Set compile flags to java include files if given -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=""] -) -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]) - 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], - [AS_HELP_STRING([--with-jni-interface],[build JNI interface between C and Java. Needs Java include files [default=no]])], - [jni_interface=$withval], +AC_ARG_ENABLE([jni-interface], + [AS_HELP_STRING([--enable-jni-interface],[build JNI interface between C and Java. Needs Java include files [default=no]])], + [jni_interface=$enableval], [jni_interface=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 option to point to your JDK directory, or disable the JNI interface.]) - ]) -]) AM_CONDITIONAL([BUILD_JNI_INTERFACE], [test "x$jni_interface" = "xyes"]) + +AC_ARG_ENABLE([java-agent-jul], + [AS_HELP_STRING([--enable-java-agent-jul],[build the LTTng UST Java agent with JUL support [default=no]])], + [java_agent_jul=$enableval], + [java_agent_jul=no] +) + +AC_ARG_ENABLE([java-agent-log4j], + [AS_HELP_STRING([--enable-java-agent-log4j],[build the LTTng UST Java agent with Log4j support [default=no]])], + [java_agent_log4j=$enableval], + [java_agent_log4j=no] +) + +AC_ARG_ENABLE([java-agent-all], + [AS_HELP_STRING([--enable-java-agent-all],[build the LTTng UST Java agent with all supported backends [default=no]])], + [java_agent_jul=$enableval + java_agent_log4j=$enableval], + [:] +) + + +AM_CONDITIONAL([BUILD_JAVA_AGENT], [test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"]) +AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_JUL], [test "x$java_agent_jul" = "xyes"]) +AM_CONDITIONAL([BUILD_JAVA_AGENT_WITH_LOG4J], [test "x$java_agent_log4j" = "xyes"]) + +if test "x$jni_interface" = "xyes" || test "x$java_agent_jul" = "xyes" || test "x$java_agent_log4j" = "xyes"; then + AX_JAVA_OPTIONS + AX_PROG_JAVAC + AX_PROG_JAVA + AX_PROG_JAR + + AX_JNI_INCLUDE_DIR + for JNI_INCLUDE_DIR in $JNI_INCLUDE_DIRS + do + CPPFLAGS="$CPPFLAGS -I$JNI_INCLUDE_DIR" + done + + AX_PROG_JAVAH +fi + +if test "x$java_agent_log4j" = "xyes"; then + AX_CHECK_CLASSPATH + + AX_CHECK_CLASS(org.apache.log4j.Logger) + + if test "x$ac_cv_class_org_apache_log4j_Logger" = "xno"; then + AC_MSG_ERROR([The UST Java agent support for log4j was requested but the Log4j classes were not found. Please specify the location of the Log4j jar via the Java CLASSPATH e.g: export CLASSPATH="/path/to/log4j.jar"]) + fi +fi + +# Option to build the python agent +AC_ARG_ENABLE([python-agent], + [AS_HELP_STRING([--enable-python-agent],[build the LTTng UST Python agent [default=no]])], + [python_agent=$enableval], + [:] +) +AM_CONDITIONAL([BUILD_PYTHON_AGENT], [test "x$python_agent" = "xyes"]) +if test "x$python_agent" = "xyes"; then + AM_PATH_PYTHON([2.7]) +fi + # sdt.h integration AC_ARG_WITH([sdt], [AS_HELP_STRING([--with-sdt],[provide SystemTap integration via sdt.h [default=no]])], @@ -320,10 +366,7 @@ AC_ARG_WITH([lttng-system-rundir], 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,[:]) +AC_CHECK_PROG([BUILD_GEN_TP_EXAMPLES],[python],["yes"]) AM_CONDITIONAL([BUILD_GEN_TP_EXAMPLES], [test $BUILD_GEN_TP_EXAMPLES], [Build examples requiring lttng-gen-tp]) AC_CONFIG_FILES([ @@ -340,9 +383,16 @@ AC_CONFIG_FILES([ liblttng-ust-fork/Makefile liblttng-ust-dl/Makefile liblttng-ust-java/Makefile - liblttng-ust-jul/Makefile + liblttng-ust-java-agent/Makefile + liblttng-ust-java-agent/java/Makefile + liblttng-ust-java-agent/jni/Makefile + liblttng-ust-java-agent/jni/jul/Makefile + liblttng-ust-java-agent/jni/log4j/Makefile liblttng-ust-libc-wrapper/Makefile liblttng-ust-cyg-profile/Makefile + liblttng-ust-python-agent/Makefile + liblttng-ust-python-agent/setup.py + liblttng-ust-python-agent/lttngust/__init__.py tools/Makefile tests/Makefile tests/hello/Makefile @@ -351,10 +401,17 @@ AC_CONFIG_FILES([ tests/snprintf/Makefile tests/benchmark/Makefile tests/utils/Makefile - tests/java-jul/Makefile lttng-ust.pc ]) +# Create link for python agent for the VPATH guru. +AC_CONFIG_LINKS([ + liblttng-ust-python-agent/lttngust/agent.py:liblttng-ust-python-agent/lttngust/agent.py + liblttng-ust-python-agent/lttngust/cmd.py:liblttng-ust-python-agent/lttngust/cmd.py + liblttng-ust-python-agent/lttngust/debug.py:liblttng-ust-python-agent/lttngust/debug.py + liblttng-ust-python-agent/lttngust/loghandler.py:liblttng-ust-python-agent/lttngust/loghandler.py +]) + AC_OUTPUT AS_ECHO() @@ -366,12 +423,27 @@ AS_ECHO() AS_ECHO("LTTng-UST will be built with the following options:") AS_ECHO() -AS_ECHO_N("Java support (JNI): ") + +AS_ECHO_N("Java agent (JUL support): ") +AS_IF([test "x$java_agent_jul" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")]) + +AS_ECHO_N("Java agent (Log4j support): ") +AS_IF([test "x$java_agent_log4j" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")]) + +AS_ECHO_N("JNI interface (JNI): ") AS_IF([test "x$jni_interface" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disabled")]) -AS_ECHO_N("sdt.h integration: ") +AS_ECHO_N("Python ($PYTHON) agent: ") +AS_IF([test "x$python_agent" = "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("Architecture: $host_cpu") +AS_ECHO_N("Efficient unaligned memory access: ") +AS_IF([test "x$NO_UNALIGNED_ACCESS" != "x1"], [AS_ECHO("yes")], [AS_IF([test "x$UNSUPPORTED_ARCH" != "x1"], [AS_ECHO("no")], [AS_ECHO("unknown")])]) +AS_IF([test "x$UNSUPPORTED_ARCH" = "x1"], [AC_MSG_WARN([Your architecture ($host_cpu) is unsupported, using safe default of no unaligned access])]) AS_ECHO() + AS_ECHO("Type 'make' to compile.")