aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMohamad Gebai <mohamad.gebai@gmail.com>2014-01-29 22:47:54 -0500
committerStefan Hajnoczi <stefanha@redhat.com>2014-02-19 11:08:53 +0100
commitbf15f63cad5c909890be6656743979c7a46ab56d (patch)
tree435606fc189b68a1c384643f9d4041e90265bdad
parent46eef33b89e936ca793e13c4aeea1414e97e8dbb (diff)
downloadqemu-bf15f63cad5c909890be6656743979c7a46ab56d.zip
qemu-bf15f63cad5c909890be6656743979c7a46ab56d.tar.gz
qemu-bf15f63cad5c909890be6656743979c7a46ab56d.tar.bz2
Fix configure script for LTTng 2.x
Signed-off-by: Mohamad Gebai <mohamad.gebai@polymtl.ca> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
-rwxr-xr-xconfigure20
1 files 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