# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([ust], [0.13], [nils dot carlson at ericsson dot com])
+AC_INIT([lttng-ust], [1.9.0], [mathieu dot desnoyers at efficios dot com])
AC_CONFIG_AUX_DIR([config])
AC_CANONICAL_TARGET
AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([config])
AM_INIT_AUTOMAKE([foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-AC_CONFIG_SRCDIR([ustctl/ustctl.c])
-AC_CONFIG_HEADERS([config.h include/ust/config.h])
+AC_CONFIG_SRCDIR([include/lttng/tracepoint.h])
+AC_CONFIG_HEADERS([config.h include/lttng/config.h])
AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
# Compute minor/major version numbers
major_version=`echo AC_PACKAGE_VERSION | sed 's/\..*//'`
AC_PROG_LIBTOOL
## Checks for libraries.
-## FIXME: Replace `main' with a function in `-ldl':
-#AC_CHECK_LIB([dl], [main])
-## FIXME: Replace `main' with a function in `-lmarkers':
-#AC_CHECK_LIB([markers], [main])
-## FIXME: Replace `main' with a function in `-lpthread':
-#AC_CHECK_LIB([pthread], [main])
-## FIXME: Replace `main' with a function in `-ltracectl':
-#AC_CHECK_LIB([tracectl], [main])
-## FIXME: Replace `main' with a function in `-ltracing':
-#AC_CHECK_LIB([tracing], [main])
-## FIXME: Replace `main' with a function in `-lurcu':
-#AC_CHECK_LIB([urcu], [main])
+AC_CHECK_LIB([dl], [dlopen])
+AC_CHECK_LIB([pthread], [pthread_create])
# Checks for header files.
#AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
AC_CHECK_HEADERS([urcu-bp.h], [], [AC_MSG_ERROR([Cannot find [URCU] headers (urcu-bp.h). Use [CFLAGS]=-Idir to specify their location.
This error can also occur when the liburcu package's configure script has not been run.])])
+AC_MSG_CHECKING([caa_likely()])
+AC_TRY_COMPILE(
+[
+#include <urcu/compiler.h>
+],
+[
+void fct(void)
+{
+ if (caa_likely(1)) {
+ }
+}
+],
+[
+ AC_MSG_RESULT([yes])
+],
+[
+ AC_MSG_RESULT([no])
+ AC_MSG_ERROR([Please upgrade your version of liburcu to 0.6.6 or better])
+]
+)
+
# urcu - check that URCU lib is available to compilation
AC_CHECK_LIB([urcu-bp], [synchronize_rcu_bp], [], [AC_MSG_ERROR([Cannot find liburcu-bp lib. Use [LDFLAGS]=-Ldir to specify its location.])])
-# urcu - check that URCU lib is at least version 0.5.5
-AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.5.5 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])])
+# urcu - check that URCU lib is at least version 0.6
+AC_CHECK_LIB([urcu-bp], [call_rcu_bp], [], [AC_MSG_ERROR([liburcu 0.6 or newer is needed, please update your version or use [LDFLAGS]=-Ldir to specify the right location.])])
# Check for various supplementary host information (beyond the
x86_64) LIBFORMAT="elf64-x86-64" ;;
powerpc) LIBFORMAT="elf32-powerpc" ;;
ppc64) LIBFORMAT="elf64-powerpc" ;;
- s390) LIBFORMAT="elf32-s390" ;;
- s390x) LIBFORMAT="elf64-s390" ;;
+ powerpc64) LIBFORMAT="elf64-powerpc" ;;
+ s390) LIBFORMAT="elf32-s390"; NO_UNALIGNED_ACCESS=1 ;;
+ s390x) LIBFORMAT="elf64-s390"; NO_UNALIGNED_ACCESS=1 ;;
armv5) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
- arm) LIBFORMAT="elf32-littlearm" ;;
- mips*) LIBFORMAT="" ;;
+ arm) LIBFORMAT="elf32-littlearm"; NO_UNALIGNED_ACCESS=1 ;;
+ mips*) LIBFORMAT=""; NO_UNALIGNED_ACCESS=1;;
*) AC_MSG_ERROR([unable to detect library format (unsupported architecture ($host_cpu)?)]) ;;
esac
AC_SUBST(LIBFORMAT)
AC_DEFINE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [1])
fi
+# Set compile flags to java include files if given
+AC_ARG_WITH(java_jdk, [ --with-java-jdk=DIR use java jdk from DIR. Ex : $JAVA_HOME.], JAVA_SDK=$withval,)
+if test $JAVA_SDK; then
+ if test -d $JAVA_SDK; then
+ AC_MSG_RESULT([using java include in $JAVA_SDK])
+ SUBDIRS=`find $JAVA_SDK/include -type d`
+ CFLAGS+=" "
+ CFLAGS+=`for x in $SUBDIRS; do echo -n "-I$x "; done`
+ CFLAGS+=" "
+ else
+ AC_MSG_ERROR(Unable to find java include file in $JAVA_JDK)
+ fi
+fi
+
+# Check for JNI header files if requested
+AC_ARG_WITH(jni-interface, [ --with-jni-interface build JNI interface between C and java. Need java include files.
+ [[default=no]]])
+
+if test -z "$with_jni_interface"; then
+ with_jni_interface=${with_jni_interface_default-no}
+fi
+
+if test "$with_jni_interface" = "yes"; then
+ AC_CHECK_HEADERS([jni.h],,AC_MSG_ERROR([
+missing jni.h
+Make sure Sun Java or OpenJDK or GCJ is installed and that this header file exists in the system path.
+Use --with-java-jdk=DIR flag to point to your java include files or desactivate the JNI interface.]))
+fi
+AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
+
AC_CONFIG_FILES([
Makefile
+ include/Makefile
+ include/lttng/version.h
doc/Makefile
doc/man/Makefile
doc/info/Makefile
- include/Makefile
- libust/Makefile
+ snprintf/Makefile
+ libringbuffer/Makefile
+ liblttng-ust-comm/Makefile
+ liblttng-ust/Makefile
+ liblttng-ust-ctl/Makefile
+ liblttng-ust-fork/Makefile
+ liblttng-ust-java/Makefile
+ liblttng-ust-malloc/Makefile
tests/Makefile
tests/hello/Makefile
+ tests/ust-basic-tracing/Makefile
+ tests/ust-multi-test/Makefile
tests/hello2/Makefile
tests/basic/Makefile
tests/basic_long/Makefile
tests/register_test/Makefile
tests/libustctl_function_tests/Makefile
tests/exit-fast/Makefile
- libustinstr-malloc/Makefile
- libustfork/Makefile
- libustconsumer/Makefile
- ust-consumerd/Makefile
- ustctl/Makefile
- libustcomm/Makefile
- libustctl/Makefile
- snprintf/Makefile
ust.pc
- include/ust/version.h
])
AC_OUTPUT
projects / ust.git / blobdiff