projects
/
lttng-tools.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests/unit: fix object files' location
[lttng-tools.git]
/
configure.ac
diff --git
a/configure.ac
b/configure.ac
index 6020596a1da7d2bbb412f64c68f459bd5e0d6776..978e3bc0ccd6ce1909d5e5597cbc70db9d9f5524 100644
(file)
--- a/
configure.ac
+++ b/
configure.ac
@@
-218,15
+218,17
@@
AC_CHECK_LIB([pthread], [pthread_create], [],
)
# Check libpopt
)
# Check libpopt
-AC_CHECK_LIB([popt], [poptGetContext], [],
+PKG_CHECK_MODULES([POPT], [popt],
+ [LIBS="$LIBS $POPT_LIBS"],
[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
)
AM_PATH_XML2(2.7.6, true, AC_MSG_ERROR(No supported version of libxml2 found.))
# Check for libuuid
[AC_MSG_ERROR([Cannot find libpopt. Use [LDFLAGS]=-Ldir to specify its location.])]
)
AM_PATH_XML2(2.7.6, true, AC_MSG_ERROR(No supported version of libxml2 found.))
# Check for libuuid
-
AC_CHECK_LIB([uuid], [uuid_generate
],
+
PKG_CHECK_MODULES([UUID], [uuid
],
[
[
+ LIBS="$LIBS $UUID_LIBS"
AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.])
have_libuuid=yes
],
AC_DEFINE_UNQUOTED([LTTNG_HAVE_LIBUUID], 1, [Has libuuid support.])
have_libuuid=yes
],
@@
-313,7
+315,7
@@
AC_ARG_WITH(lttng-ust-prefix,
# Check liblttng-ust-ctl library
AC_ARG_WITH(lttng-ust,
AS_HELP_STRING([--without-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]),
# Check liblttng-ust-ctl library
AC_ARG_WITH(lttng-ust,
AS_HELP_STRING([--without-lttng-ust],[build without LTTng-UST (Userspace Tracing) support]),
- lttng_ust_support=$
enable
val, lttng_ust_support=yes)
+ lttng_ust_support=$
with
val, lttng_ust_support=yes)
AS_IF([test "x$lttng_ust_support" = "xyes"], [
AC_CHECK_LIB([lttng-ust-ctl], [ustctl_recv_channel_from_consumer],
AS_IF([test "x$lttng_ust_support" = "xyes"], [
AC_CHECK_LIB([lttng-ust-ctl], [ustctl_recv_channel_from_consumer],
@@
-703,6
+705,10
@@
AM_CONDITIONAL([BUILD_LIB_SESSIOND_COMM], [test x$build_lib_sessiond_comm = xyes
AM_CONDITIONAL([BUILD_LIB_TESTPOINT], [test x$build_lib_testpoint = xyes])
AM_CONDITIONAL([BUILD_LIB_UST_CONSUMER], [test x$build_lib_ust_consumer = xyes])
AM_CONDITIONAL([BUILD_LIB_TESTPOINT], [test x$build_lib_testpoint = xyes])
AM_CONDITIONAL([BUILD_LIB_UST_CONSUMER], [test x$build_lib_ust_consumer = xyes])
+# check for pgrep
+AC_PATH_PROG([PGREP], [pgrep], [no])
+AM_CONDITIONAL([HAS_PGREP], [test "x$PGREP" != "xno"])
+
if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-parser.h"; then
if test x"$(basename "$YACC")" != "xbison -y"; then
AC_MSG_ERROR([[bison not found and is required when building from git.
if test ! -f "$srcdir/src/lib/lttng-ctl/filter/filter-parser.h"; then
if test x"$(basename "$YACC")" != "xbison -y"; then
AC_MSG_ERROR([[bison not found and is required when building from git.
@@
-801,6
+807,8
@@
AC_CONFIG_FILES([
tests/regression/ust/exit-fast/Makefile
tests/regression/ust/fork/Makefile
tests/regression/ust/libc-wrapper/Makefile
tests/regression/ust/exit-fast/Makefile
tests/regression/ust/fork/Makefile
tests/regression/ust/libc-wrapper/Makefile
+ tests/regression/ust/baddr-statedump/Makefile
+ tests/regression/ust/ust-dl/Makefile
tests/regression/ust/java-jul/Makefile
tests/regression/ust/java-log4j/Makefile
tests/regression/ust/python-logging/Makefile
tests/regression/ust/java-jul/Makefile
tests/regression/ust/java-log4j/Makefile
tests/regression/ust/python-logging/Makefile
This page took
0.026313 seconds
and
5
git commands to generate.