projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing file to extra dist
[lttng-tools.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index acf80176bb0ee27ac6b3a0b4bb35cb2eebb45247..e5f4a6c6cc633869015d10d830dc0cc1e19d1112 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-1,7
+1,9
@@
-AC_INIT([lttng-tools], [
0.0.1], [david.goulet@polymtl.ca],
[http://lttng.org])
+AC_INIT([lttng-tools], [
2.0-pre12], [david.goulet@polymtl.ca], ,
[http://lttng.org])
AC_CONFIG_AUX_DIR([config])
AC_CONFIG_AUX_DIR([config])
+AC_CANONICAL_TARGET
+AC_CANONICAL_HOST
AC_CONFIG_MACRO_DIR([config])
AC_CONFIG_MACRO_DIR([config])
-AM_INIT_AUTOMAKE
+AM_INIT_AUTOMAKE
([foreign dist-bzip2 no-dist-gzip])
AM_SILENT_RULES([yes])
AC_CHECK_HEADERS([ \
AM_SILENT_RULES([yes])
AC_CHECK_HEADERS([ \
@@
-10,6
+12,9
@@
AC_CHECK_HEADERS([ \
getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
])
getopt.h sys/ipc.h sys/shm.h popt.h grp.h \
])
+# URCU library version needed or newer
+liburcu_version="0.6.0"
+
# Check for pthread
AC_CHECK_LIB([pthread], [pthread_create], [],
[AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]
# Check for pthread
AC_CHECK_LIB([pthread], [pthread_create], [],
[AC_MSG_ERROR([Cannot find libpthread. Use [LDFLAGS]=-Ldir to specify its location.])]
@@
-20,37
+25,58
@@
AC_CHECK_LIB([popt], [poptGetContext], [],
[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
)
[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
)
-# Check libu
uid
-AC_CHECK_
LIB([uuid], [uuid_generate
], [],
- [AC_MSG_ERROR([
Cannot find libuuid. Use [LDFLAGS]=-Ldir to specify its location.])
]
+# Check libu
rcu list.h, wfqueue.h, futex.h
+AC_CHECK_
DECL([cds_list_add
], [],
+ [AC_MSG_ERROR([
liburcu $liburcu_version or newer is needed])], [[#include <urcu/list.h>]
]
)
)
-# Check libustctl
-AC_CHECK_LIB([ustctl], [ustctl_connect_pid], [],
- [AC_MSG_ERROR([Cannot find libustctl. Use [LDFLAGS]=-Ldir to specify its location.])]
+AC_CHECK_DECL([cds_wfq_init], [],
+ [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/wfqueue.h>]]
)
)
-# Check liburcu
-AC_CHECK_LIB([urcu], [synchronize_rcu], [],
- [AC_MSG_ERROR([Cannot find liburcu. Use [LDFLAGS]=-Ldir to specify its location.])]
+AC_CHECK_DECL([futex_async], [],
+ [AC_MSG_ERROR([liburcu $liburcu_version or newer is needed])], [[#include <urcu/futex.h>]]
)
)
-AC_CHECK_DECL([cds_list_add], [],
- [AC_MSG_ERROR([liburcu 0.5.4 or newer is needed])], [[#include <urcu/list.h>]]
+
+AX_HAVE_EPOLL(
+ [AX_CONFIG_FEATURE_ENABLE(epoll)],
+ [AX_CONFIG_FEATURE_DISABLE(epoll)]
)
)
-CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+AX_CONFIG_FEATURE(
+ [epoll], [This platform supports epoll(7)],
+ [HAVE_EPOLL], [This platform supports epoll(7).],
+ [enable_epoll="yes"], [enable_epoll="no"]
+)
+
+AM_CONDITIONAL([COMPAT_EPOLL], [ test "$enable_epoll" = "yes" ])
AC_PROG_CC
AC_PROG_LIBTOOL
AC_PROG_CC
AC_PROG_LIBTOOL
+CFLAGS="-Wall $CFLAGS -g -fno-strict-aliasing"
+
+DEFAULT_INCLUDES="-I\$(top_srcdir) -I\$(top_builddir)"
+
+lttngincludedir="${includedir}/lttng"
+
+AC_SUBST(lttngincludedir)
+AC_SUBST(DEFAULT_INCLUDES)
+
AC_CONFIG_FILES([
Makefile
include/Makefile
AC_CONFIG_FILES([
Makefile
include/Makefile
+ libkernelctl/Makefile
+ liblttngkconsumerd/Makefile
liblttngctl/Makefile
liblttngctl/Makefile
- liblttsessiondcomm/Makefile
+ liblttng-sessiond-comm/Makefile
+ libustctl/Makefile
+ libustcomm/Makefile
+ ltt-kconsumerd/Makefile
+ ltt-sessiond/Makefile
lttng/Makefile
tests/Makefile
lttng/Makefile
tests/Makefile
-
ltt-sessiond
/Makefile
+
doc
/Makefile
])
AC_OUTPUT
])
AC_OUTPUT
This page took
0.024978 seconds
and
4
git commands to generate.