[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 1/6] Fix configure script for LTTng 2.x
From: |
Stefan Hajnoczi |
Subject: |
[Qemu-devel] [PULL 1/6] Fix configure script for LTTng 2.x |
Date: |
Wed, 19 Feb 2014 16:45:54 +0100 |
From: Mohamad Gebai <address@hidden>
Signed-off-by: Mohamad Gebai <address@hidden>
Signed-off-by: Stefan Hajnoczi <address@hidden>
---
configure | 20 +++++++++++++++-----
1 file changed, 15 insertions(+), 5 deletions(-)
diff --git a/configure b/configure
index 4648117..8c0ead9 100755
--- a/configure
+++ b/configure
@@ -3379,15 +3379,25 @@ fi
# For 'ust' backend, test if ust headers are present
if test "$trace_backend" = "ust"; then
cat > $TMPC << EOF
-#include <ust/tracepoint.h>
-#include <ust/marker.h>
+#include <lttng/tracepoint.h>
int main(void) { return 0; }
EOF
if compile_prog "" "" ; then
- LIBS="-lust -lurcu-bp $LIBS"
- libs_qga="-lust -lurcu-bp $libs_qga"
+ if $pkg_config lttng-ust --exists; then
+ lttng_ust_libs=`$pkg_config --libs lttng-ust`
+ else
+ lttng_ust_libs="-llttng-ust"
+ fi
+ if $pkg_config liburcu-bp --exists; then
+ urcu_bp_libs=`$pkg_config --libs liburcu-bp`
+ else
+ urcu_bp_libs="-lurcu-bp"
+ fi
+
+ LIBS="$lttng_ust_libs $urcu_bp_libs $LIBS"
+ libs_qga="$lttng_ust_libs $urcu_bp_libs $libs_qga"
else
- error_exit "Trace backend 'ust' missing libust header files"
+ error_exit "Trace backend 'ust' missing lttng-ust header files"
fi
fi
--
1.8.5.3
- [Qemu-devel] [PULL 0/6] Tracing patches, Stefan Hajnoczi, 2014/02/19
- [Qemu-devel] [PULL 1/6] Fix configure script for LTTng 2.x,
Stefan Hajnoczi <=
- [Qemu-devel] [PULL 2/6] Modified the tracetool framework for LTTng 2.x, Stefan Hajnoczi, 2014/02/19
- [Qemu-devel] [PULL 4/6] Update documentation for LTTng ust tracing, Stefan Hajnoczi, 2014/02/19
- [Qemu-devel] [PULL 3/6] Adapt Makefiles to the new LTTng ust interface, Stefan Hajnoczi, 2014/02/19
- [Qemu-devel] [PULL 5/6] Add ust generated files to .gitignore, Stefan Hajnoczi, 2014/02/19
- [Qemu-devel] [PULL 6/6] trace-events: Fix typo in "offset", Stefan Hajnoczi, 2014/02/19
- Re: [Qemu-devel] [PULL 0/6] Tracing patches, LluĂs Vilanova, 2014/02/19
- Re: [Qemu-devel] [PULL 0/6] Tracing patches, Peter Maydell, 2014/02/21