AC_PREREQ([2.69])
AC_INIT([lttng-ust],[ust_version],[mathieu dot desnoyers at efficios dot com],[],[https://lttng.org])
-AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h include/lttng/ust-version.h])
+AC_CONFIG_HEADERS([src/common/config.h include/lttng/ust-config.h include/lttng/ust-version.h])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AM_PATH_PYTHON([2.7], [], [PYTHON=""])
-AX_PROG_JAVAC
-AX_PROG_JAVA
-AX_PROG_JAR
-
# Initialize and configure libtool
LT_INIT([disable-static])
# 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])], [
- # We detected a java compiler earlier, make sure it works
- AX_PROG_JAVAC_WORKS
+ AX_PROG_JAVAC
+ AX_PROG_JAVA
+ AX_PROG_JAR
# Get the CPPFLAGS required to build jni libaries
AX_JNI_INCLUDE_DIR
AC_SUBST([LTTNG_UST_LIBRARY_VERSION], ust_lib_version)
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"
AC_SUBST(AM_CFLAGS)
# The order in which the include folders are searched is important.
# The top_builddir should always be searched first in the event that a build
# time generated file is included.
-AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -include config.h"
+AM_CPPFLAGS="-I\$(top_builddir)/include -I\$(top_srcdir)/include -I\$(top_builddir)/src -I\$(top_srcdir)/src -include common/config.h"
AC_SUBST(AM_CPPFLAGS)
AC_SUBST(JNI_CPPFLAGS)
# List of files to be generated from '.in' templates by AC_OUTPUT
AC_CONFIG_FILES([
Makefile
- doc/Makefile
doc/examples/Makefile
+ doc/Makefile
doc/man/Makefile
include/Makefile
- snprintf/Makefile
- libcounter/Makefile
- libmsgpack/Makefile
- libringbuffer/Makefile
- liblttng-ust-comm/Makefile
- liblttng-ust/Makefile
- liblttng-ust-ctl/Makefile
- liblttng-ust-fork/Makefile
- liblttng-ust-dl/Makefile
- liblttng-ust-fd/Makefile
- liblttng-ust-java/Makefile
- liblttng-ust-java-agent/Makefile
- liblttng-ust-java-agent/java/Makefile
- liblttng-ust-java-agent/java/lttng-ust-agent-all/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/compile/Makefile
+ src/common/Makefile
+ src/lib/lttng-ust-ctl/Makefile
+ src/lib/lttng-ust-cyg-profile/Makefile
+ src/lib/lttng-ust-dl/Makefile
+ src/lib/lttng-ust-fd/Makefile
+ src/lib/lttng-ust-fork/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/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/lib/lttng-ust/Makefile
+ src/lib/lttng-ust-python-agent/Makefile
+ src/lib/Makefile
+ src/lttng-ust-ctl.pc
+ src/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/Makefile
tests/compile/same_line_tracepoint/Makefile
tests/compile/test-app-ctx/Makefile
- tests/benchmark/Makefile
+ tests/Makefile
tests/unit/gcc-weak-hidden/Makefile
tests/unit/libmsgpack/Makefile
- tests/unit/Makefile
tests/unit/libringbuffer/Makefile
+ tests/unit/Makefile
tests/unit/pthread_name/Makefile
tests/unit/snprintf/Makefile
tests/unit/ust-elf/Makefile
+ tests/unit/ust-error/Makefile
+ tests/unit/ust-utils/Makefile
tests/utils/Makefile
- lttng-ust.pc
- lttng-ust-ctl.pc
+ tools/Makefile
])
AC_OUTPUT