projects
/
lttng-ust.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add check for libuuid to configure.ac
[lttng-ust.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 10e1af443a4b61bdbf2786d9e458bbe366aecdd2..391cc9ac5de1b886b5f8512cfe3e65131a28b642 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,15
+1,15
@@
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
# -*- Autoconf -*-
# Process this file with autoconf to produce a configure script.
-AC_INIT([ust], [1.9.0], [mathieu dot desnoyers at efficios 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_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([include/
ust
/tracepoint.h])
-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/\..*//'`
AH_TEMPLATE([HAVE_EFFICIENT_UNALIGNED_ACCESS], [Use efficient unaligned access.])
# Compute minor/major version numbers
major_version=`echo AC_PACKAGE_VERSION | sed 's/\..*//'`
@@
-29,6
+29,11
@@
AC_PROG_LIBTOOL
AC_CHECK_LIB([dl], [dlopen])
AC_CHECK_LIB([pthread], [pthread_create])
AC_CHECK_LIB([dl], [dlopen])
AC_CHECK_LIB([pthread], [pthread_create])
+# Check for libuuid
+AC_CHECK_LIB([uuid], [uuid_generate], [],
+ [AC_MSG_ERROR([Cannot find libuuid. Use [LDFLAGS]=-Ldir to specify its location.])]
+)
+
# Checks for header files.
#AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
# Checks for header files.
#AC_CHECK_HEADERS([fcntl.h stdint.h stdlib.h string.h sys/socket.h sys/time.h unistd.h])
@@
-59,6
+64,27
@@
CFLAGS="-Wall $CFLAGS"
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_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 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.])])
@@
-168,14
+194,19
@@
AM_CONDITIONAL(BUILD_JNI_INTERFACE, test "$with_jni_interface" = "yes")
AC_CONFIG_FILES([
Makefile
AC_CONFIG_FILES([
Makefile
+ include/Makefile
+ include/lttng/version.h
doc/Makefile
doc/man/Makefile
doc/info/Makefile
doc/Makefile
doc/man/Makefile
doc/info/Makefile
- include/Makefile
- liblttng-ust-comm/Makefile
+ snprintf/Makefile
libringbuffer/Makefile
libringbuffer/Makefile
- libust/Makefile
- libustctl/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/Makefile
tests/hello/Makefile
tests/ust-basic-tracing/Makefile
@@
-196,11
+227,6
@@
AC_CONFIG_FILES([
tests/register_test/Makefile
tests/libustctl_function_tests/Makefile
tests/exit-fast/Makefile
tests/register_test/Makefile
tests/libustctl_function_tests/Makefile
tests/exit-fast/Makefile
- libustinstr-malloc/Makefile
- libustfork/Makefile
- snprintf/Makefile
- ust.pc
- include/ust/version.h
- libustjava/Makefile
+ lttng-ust.pc
])
AC_OUTPUT
])
AC_OUTPUT
This page took
0.036093 seconds
and
4
git commands to generate.