# liblttng-ust, lttng-sessiond, and lttng-consumerd.
AC_SUBST([LTTNG_UST_CTL_LIBRARY_VERSION], [4:0:0])
-AC_CONFIG_HEADERS([config.h include/lttng/ust-config.h])
+AC_CONFIG_HEADERS([include/config.h include/lttng/ust-config.h])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
-AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar])
+AM_INIT_AUTOMAKE([1.12 foreign dist-bzip2 no-dist-gzip tar-ustar nostdinc])
AM_MAINTAINER_MODE([enable])
# Enable silent rules if available (Introduced in AM 1.11)
[:],
[AC_MSG_ERROR([The compiler does not support __attribute__ extensions])])
+AX_PTHREAD(,[AC_MSG_ERROR([Could not configure pthreads support])])
+
# Checks for library functions.
AC_FUNC_CHOWN
AC_FUNC_FORK
sysconf \
])
+# Check for pthread_setname_np and its signature
+LTTNG_PTHREAD_SETNAME_NP
+
# AC_FUNC_MALLOC causes problems when cross-compiling.
#AC_FUNC_MALLOC
NO_UNALIGNED_ACCESS=1
])
+# Set os specific options
+AS_CASE([$host_os],
+ [freebsd*], [NO_NUMA=1]
+)
+
# Configuration options, which will be installed in the 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])
[AC_DEFINE([HAVE_DLMOPEN], [1])]
)
-AC_CHECK_LIB([pthread], [pthread_create])
-AC_CHECK_LIB([pthread], [pthread_setname_np],
- AC_DEFINE([HAVE_PTHREAD_SETNAME_NP], [1], [Define to 1 if pthread_setname_np is available.]),
- AC_CHECK_LIB([pthread], [pthread_set_name_np],
- AC_DEFINE([HAVE_PTHREAD_SET_NAME_NP], [1], [Define to 1 if pthread_set_name_np is available.]),
- AC_MSG_RESULT([pthread setname/set_name not found.])))
-
# Check for dlfcn.h
AC_CHECK_HEADER([dlfcn.h])
AS_IF([test "x${ac_cv_header_dlfcn_h}" = "xyes"], [
AC_CHECK_DECLS([RTLD_DI_LINKMAP], [], [], [
- #define _GNU_SOURCE /* Required on Linux to get GNU extensions */
#include <dlfcn.h>
])
], [
_AC_DEFINE_AND_SUBST([LTTNG_UST_DEFAULT_CONSTRUCTOR_TIMEOUT_MS], [3000])
-AM_CFLAGS="-Wall"
+AM_CFLAGS="-Wall $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"
+AC_SUBST(AM_CPPFLAGS)
+
AC_SUBST(JNI_CPPFLAGS)
AC_CONFIG_FILES([
tests/snprintf/Makefile
tests/ust-elf/Makefile
tests/benchmark/Makefile
+ tests/pthread_name/Makefile
tests/utils/Makefile
tests/test-app-ctx/Makefile
tests/gcc-weak-hidden/Makefile