X-Git-Url: http://git.lttng.org./?a=blobdiff_plain;f=configure.ac;h=9f48768d991fb28436c7182cd45f98256c7176cd;hb=16f9d99cacc9e873e570964ef1babfffe93be65e;hp=82db75bd1a6126902fc4b5225bc79ce5ccac0b10;hpb=501f6777610d7f8d855453c0083a10912d5fac4b;p=lttng-ust.git diff --git a/configure.ac b/configure.ac index 82db75bd..9f48768d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,17 @@ # -*- 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]) +dnl Version infos +m4_define([V_MAJOR], [2]) +m4_define([V_MINOR], [8]) +m4_define([V_PATCH], [0]) +m4_define([V_EXTRA], [pre]) +m4_define([V_STRING], [V_MAJOR.V_MINOR.V_PATCH]) +m4_ifdef([V_EXTRA], [m4_append([V_STRING], [-V_EXTRA])]) +m4_define([V_NAME], [[Herbe à Détourne]]) +m4_define([V_DESC], [[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.]]) + +AC_INIT([lttng-ust],V_STRING,[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 @@ -18,7 +28,7 @@ AC_CONFIG_AUX_DIR([config]) AC_CANONICAL_TARGET AC_CANONICAL_HOST AC_CONFIG_MACRO_DIR([config]) -AM_INIT_AUTOMAKE([foreign dist-bzip2 no-dist-gzip]) +AM_INIT_AUTOMAKE([1.9 foreign dist-bzip2 no-dist-gzip tar-ustar]) AM_MAINTAINER_MODE([enable]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])]) AC_CONFIG_SRCDIR([include/lttng/tracepoint.h]) @@ -29,25 +39,14 @@ AH_TEMPLATE([LTTNG_UST_HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligne AH_TEMPLATE([LTTNG_UST_HAVE_SDT_INTEGRATION], [SystemTap integration via sdt.h]) AH_TEMPLATE([LTTNG_UST_HAVE_PERF_EVENT], [Perf event integration via perf_event.h]) -# Compute minor/major/patchlevel version numbers +# Substitute 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="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." - -AC_DEFINE_UNQUOTED([VERSION_NAME], ["$version_name"], [UST version name]) -AC_DEFINE_UNQUOTED([VERSION_DESCRIPTION], ["$version_description"], [UST version description]) +AC_SUBST([MAJOR_VERSION], [V_MAJOR]) +AC_SUBST([MINOR_VERSION], [V_MINOR]) +AC_SUBST([PATCHLEVEL_VERSION], [V_PATCH]) 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 +104,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 +236,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]) @@ -243,7 +253,7 @@ fi # Check for JNI header files if requested 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=$withval], + [jni_interface=$enableval], [jni_interface=no] ) @@ -299,6 +309,17 @@ if test "x$java_agent_log4j" = "xyes"; then 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]])], @@ -342,7 +363,7 @@ AC_ARG_WITH([lttng-system-rundir], AC_DEFINE_UNQUOTED([LTTNG_SYSTEM_RUNDIR], ["$lttng_system_rundir"], [LTTng system runtime directory]) -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([ @@ -361,27 +382,46 @@ AC_CONFIG_FILES([ liblttng-ust-java/Makefile liblttng-ust-java-agent/Makefile liblttng-ust-java-agent/java/Makefile + liblttng-ust-java-agent/java/lttng-ust-agent-common/Makefile + liblttng-ust-java-agent/java/lttng-ust-agent-jul/Makefile + liblttng-ust-java-agent/java/lttng-ust-agent-log4j/Makefile liblttng-ust-java-agent/jni/Makefile + liblttng-ust-java-agent/jni/common/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 + python-lttngust/Makefile + python-lttngust/setup.py + python-lttngust/lttngust/__init__.py tools/Makefile tests/Makefile + tests/ctf-types/Makefile tests/hello/Makefile tests/hello.cxx/Makefile tests/same_line_tracepoint/Makefile tests/snprintf/Makefile + tests/ust-elf/Makefile tests/benchmark/Makefile tests/utils/Makefile + tests/test-app-ctx/Makefile lttng-ust.pc ]) +# Create link for python agent for the VPATH guru. +AC_CONFIG_LINKS([ + python-lttngust/lttngust/agent.py:python-lttngust/lttngust/agent.py + python-lttngust/lttngust/cmd.py:python-lttngust/lttngust/cmd.py + python-lttngust/lttngust/debug.py:python-lttngust/lttngust/debug.py + python-lttngust/lttngust/loghandler.py:python-lttngust/lttngust/loghandler.py +]) + AC_OUTPUT +AS_ECHO(["m4_bpatsubst(V_NAME, ["], [\\"])"]) AS_ECHO() -AS_ECHO("Version name: $version_name") -AS_ECHO("$version_description") +AS_ECHO(["m4_bpatsubst(V_DESC, ["], [\\"])"]) # Report on the configuration options AS_ECHO() @@ -398,9 +438,17 @@ AS_IF([test "x$java_agent_log4j" = "xyes"], [AS_ECHO("Enabled")], [AS_ECHO("Disa 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.")